diff --git a/CHANGELOG-8.0.md b/CHANGELOG-8.0.md
index f470862e7a..f5acd59ba9 100644
--- a/CHANGELOG-8.0.md
+++ b/CHANGELOG-8.0.md
@@ -64,4 +64,5 @@
 - Deprecated `handleDatabaseException` functionality
 - Dependency on `oxideshop-facts` component
 - `FileCache` and `SubShopSpecificFileCache` classes. Use `ContextInterface::getCurrentShopId()` instead
-- Legacy file-based caching methods from `Utils` class
\ No newline at end of file
+- Legacy file-based caching methods from `Utils` class
+- Remove `DateFormatHelper`
\ No newline at end of file
diff --git a/source/Internal/Transition/Adapter/TemplateLogic/DateFormatHelper.php b/source/Internal/Transition/Adapter/TemplateLogic/DateFormatHelper.php
deleted file mode 100644
index b399fc5e94..0000000000
--- a/source/Internal/Transition/Adapter/TemplateLogic/DateFormatHelper.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Copyright © OXID eSales AG. All rights reserved.
- * See LICENSE file for license details.
- */
-
-namespace OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic;
-
-use function sprintf;
-
-class DateFormatHelper
-{
-    /**
-     * @param string $format
-     * @param int    $timestamp
-     *
-     * @return string
-     */
-    public function fixWindowsTimeFormat($format, $timestamp)
-    {
-        $winFormatSearch = ['%D', '%h', '%n', '%r', '%R', '%t', '%T'];
-        $winFormatReplace = ['%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S'];
-        if (str_contains($format, '%e')) {
-            $winFormatSearch[] = '%e';
-            $winFormatReplace[] = sprintf("%' 2d", date('j', $timestamp));
-        }
-        if (str_contains($format, '%l')) {
-            $winFormatSearch[] = '%l';
-            $winFormatReplace[] = sprintf("%' 2d", date('g', $timestamp));
-        }
-
-        return str_replace($winFormatSearch, $winFormatReplace, $format);
-    }
-}
diff --git a/source/Internal/Transition/Adapter/TemplateLogic/services.yaml b/source/Internal/Transition/Adapter/TemplateLogic/services.yaml
index 6419e462c1..8120d0beae 100644
--- a/source/Internal/Transition/Adapter/TemplateLogic/services.yaml
+++ b/source/Internal/Transition/Adapter/TemplateLogic/services.yaml
@@ -63,8 +63,5 @@ services:
   OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\InputHelpLogic:
     class: OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\InputHelpLogic
 
-  OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\DateFormatHelper:
-    class: OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\DateFormatHelper
-
   OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\InsertNewBasketItemLogicTwig:
     class: OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\InsertNewBasketItemLogicTwig
diff --git a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/DateFormatHelperTest.php b/tests/Integration/Internal/Transition/Adapter/TemplateLogic/DateFormatHelperTest.php
deleted file mode 100644
index 5a030f980d..0000000000
--- a/tests/Integration/Internal/Transition/Adapter/TemplateLogic/DateFormatHelperTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Copyright © OXID eSales AG. All rights reserved.
- * See LICENSE file for license details.
- */
-
-declare(strict_types=1);
-
-namespace OxidEsales\EshopCommunity\Tests\Integration\Internal\Transition\Adapter\TemplateLogic;
-
-use OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\DateFormatHelper;
-use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\TestCase;
-
-#[CoversClass(DateFormatHelper::class)]
-final class DateFormatHelperTest extends TestCase
-{
-    public static function provider(): array
-    {
-        return [
-            ['%D %h %n %r %R %t %T', 1543850519, "%m/%d/%y %b \n %I:%M:%S %p %H:%M 	 %H:%M:%S"],
-            ['%T %t %R %r %n %h %D', 1543850519, "%H:%M:%S 	 %H:%M %I:%M:%S %p \n %b %m/%d/%y"],
-        ];
-    }
-
-    #[DataProvider('provider')]
-    public function testFixWindowsTimeFormat(string $format, int|string $timestamp, string $expectedFormat): void
-    {
-        $actualFormat = (new DateFormatHelper())->fixWindowsTimeFormat($format, $timestamp);
-
-        $this->assertEquals($expectedFormat, $actualFormat);
-    }
-
-    public function testFixWindowsTimeFormatWithDay(): void
-    {
-        $someTimestamp = 691200;
-        $dayWithoutZero = date('j', $someTimestamp);
-
-        $actualFormat = (new DateFormatHelper())->fixWindowsTimeFormat('%e', $someTimestamp);
-
-        $this->assertEquals(" $dayWithoutZero", $actualFormat);
-    }
-
-    public function testFixWindowsTimeFormatWithHour(): void
-    {
-        $someTimestamp = 46800;
-        $hourWithoutZero = date('g', $someTimestamp);
-
-        $actualFormat = (new DateFormatHelper())->fixWindowsTimeFormat('%l', $someTimestamp);
-
-        $this->assertEquals(" $hourWithoutZero", $actualFormat);
-    }
-
-    public function testFixWindowsTimeFormatWithNonTimeString(): void
-    {
-        $actualFormat = (new DateFormatHelper())->fixWindowsTimeFormat('foo', '');
-
-        $this->assertEquals('foo', $actualFormat);
-    }
-}