diff --git a/Build/phpmd.xml b/Build/phpmd.xml
index f987ad9..7f5b84e 100644
--- a/Build/phpmd.xml
+++ b/Build/phpmd.xml
@@ -4,10 +4,7 @@
         PHPMD rules for Tea
     </description>
 
-    <!-- The commented-out rules will be enabled once the code does not generate any warnings anymore. -->
-
     <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
-    <rule ref="rulesets/cleancode.xml/StaticAccess"/>
 
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
     <rule ref="rulesets/codesize.xml/NPathComplexity"/>
diff --git a/composer.json b/composer.json
index e1c48f6..b2576d6 100644
--- a/composer.json
+++ b/composer.json
@@ -220,10 +220,10 @@
 		"ci:php": "Runs all static checks for the PHP files.",
 		"ci:php:cs-fixer": "Checks the code style with the PHP Coding Standards Fixer (PHP-CS-Fixer).",
 		"ci:php:lint": "Lints the PHP files for syntax errors.",
+		"ci:php:mess": "Runs mess decection on folder classes",
 		"ci:php:sniff": "Checks the code style with PHP_CodeSniffer (PHPCS).",
 		"ci:php:stan": "Checks the PHP types using PHPStan.",
 		"ci:static": "Runs all static code checks (syntax, style, types).",
-		"ci:php:mess": "Runs mess decection on folder classes",
 		"ci:tests:create-directories": "Creates the directories required to smoothely run the functional tests.",
 		"ci:tests:functional": "Runs the functional tests.",
 		"ci:tests:unit": "Runs the unit tests.",