diff --git a/Magento2/Sniffs/PHP/DateTimeSniff.php b/Magento2/Sniffs/PHP/DateTimeSniff.php
deleted file mode 100644
index 69daeeee..00000000
--- a/Magento2/Sniffs/PHP/DateTimeSniff.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Sniffs\PHP;
-
-use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Files\File;
-
-/**
- * Detects overcomplicated Date/Time handling.
- */
-class DateTimeSniff implements Sniff
-{
-    /**
-     * String representation of warning.
-     *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
-     *
-     * @var string
-     */
-    protected $warningMessage = 'Overcomplicated Date/Time handling. Use \Magento\Framework\Stdlib\DateTime\TimezoneInterface instead.';
-    // phpcs:enable
-
-    /**
-     * Warning violation code.
-     *
-     * @var string
-     */
-    protected $warningCode = 'Overcomplicated';
-
-    /**
-     * Class names to find.
-     *
-     * @var array
-     */
-    protected $dateTimeClasses = [
-        'DateTime',
-        'DateTimeZone',
-        'Zend_Date',
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register()
-    {
-        return [T_NEW];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $posOfClassName = $phpcsFile->findNext(T_STRING, $stackPtr);
-        $posOfNsSeparator = $phpcsFile->findNext(T_NS_SEPARATOR, $stackPtr, $posOfClassName);
-        if ($posOfNsSeparator !== false && in_array($tokens[$posOfClassName]['content'], $this->dateTimeClasses)) {
-            $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
-        }
-    }
-}
diff --git a/Magento2/Tests/PHP/DateTimeUnitTest.inc b/Magento2/Tests/PHP/DateTimeUnitTest.inc
deleted file mode 100644
index 7882f090..00000000
--- a/Magento2/Tests/PHP/DateTimeUnitTest.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Magento2\Backend\Block\Widget\Grid\Column\Renderer;
-
-use \Magento2\Framework\Stdlib\DateTime\TimezoneInterface;
-
-class Test
-{
-    protected $localeDate;
-
-    public function __construct(
-
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-
-    ) {
-        $this->localeDate = $localeDate;
-    }
-
-    public function getDate()
-    {
-        return new \DateTime();
-    }
-
-    public function getTimeZone()
-    {
-        return new \DateTimeZone();
-    }
-
-    public function getTimeZoneInterfase()
-    {
-        return $this->localeDate->date();
-    }
-}
diff --git a/Magento2/Tests/PHP/DateTimeUnitTest.php b/Magento2/Tests/PHP/DateTimeUnitTest.php
deleted file mode 100644
index ea370863..00000000
--- a/Magento2/Tests/PHP/DateTimeUnitTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento2\Tests\PHP;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Class DateTimeUnitTest
- */
-class DateTimeUnitTest extends AbstractSniffUnitTest
-{
-    /**
-     * @inheritdoc
-     */
-    public function getErrorList()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getWarningList()
-    {
-        return [
-            21 => 1,
-            26 => 1
-        ];
-    }
-}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 58ed935a..68c3323b 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -86,12 +86,6 @@
         <severity>9</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Magento2.PHP.DateTime">
-        <severity>9</severity>
-        <type>warning</type>
-        <exclude-pattern>*/lib/*</exclude-pattern>
-        <exclude-pattern>*/Test/*</exclude-pattern>
-    </rule>
     <rule ref="Magento2.Security.InsecureFunction">
         <severity>9</severity>
         <type>warning</type>
@@ -110,6 +104,8 @@
     <rule ref="Magento2.SQL.RawQuery">
         <severity>9</severity>
         <type>warning</type>
+        <exclude-pattern>*/lib/*</exclude-pattern>
+        <exclude-pattern>*/Test/*</exclude-pattern>
     </rule>
     <rule ref="Squiz.PHP.NonExecutableCode">
         <severity>9</severity>
@@ -193,10 +189,6 @@
         <severity>7</severity>
         <type>warning</type>
     </rule>
-    <rule ref="Generic.Metrics.CyclomaticComplexity">
-        <severity>7</severity>
-        <type>warning</type>
-    </rule>
     <rule ref="Generic.Metrics.NestingLevel">
         <severity>7</severity>
         <type>warning</type>
@@ -211,6 +203,7 @@
     <rule ref="Magento2.CodeAnalysis.EmptyBlock">
         <severity>7</severity>
         <type>warning</type>
+        <exclude-pattern>*/Test/*</exclude-pattern>
     </rule>
     <rule ref="Magento2.PHP.LiteralNamespaces">
         <severity>7</severity>