diff --git a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
index b9c4a6964..43bfd9b49 100644
--- a/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
+++ b/tests/codesniffer/FHComplete/Sniffs/NamingConventions/ValidFunctionNameSniff.php
@@ -105,25 +105,6 @@ class FHComplete_Sniffs_NamingConventions_ValidFunctionNameSniff extends PHP_Cod
 				return;
 			}
 		}
-		//elseif ($isPrivate === true) {
-		//	if (substr($methodName, 0, 2) !== '__') {
-		//		$error = 'Private method name "%s" must be prefixed with 2 underscores';
-		//		$phpcsFile->addError($error, $stackPtr, 'PrivateNoUnderscore', $errorData);
-		//		return;
-		//	} else {
-		//		$filename = $phpcsFile->getFilename();
-		//		if (strpos($filename, '/lib/Cake/') === true) {
-		//			$warning = 'Private method name "%s" in FHComplete core is discouraged';
-		//			$phpcsFile->addWarning($warning, $stackPtr, 'PrivateMethodInCore', $errorData);
-		//		}
-		//	}
-		//} else {
-		//	if ($methodName[0] !== '_' || substr($methodName, 0, 2) === '__') {
-		//		$error = 'Protected method name "%s" must be prefixed with one underscore';
-		//		$phpcsFile->addError($error, $stackPtr, 'ProtectedNoUnderscore', $errorData);
-		//		return;
-		//	}
-		//}
 	}
 
 /**
diff --git a/tests/codesniffer/FHComplete/ruleset.xml b/tests/codesniffer/FHComplete/ruleset.xml
index 25055a89a..80c043082 100644
--- a/tests/codesniffer/FHComplete/ruleset.xml
+++ b/tests/codesniffer/FHComplete/ruleset.xml
@@ -14,6 +14,7 @@
 	<exclude name="Squiz.ControlStructures.ControlSignature" />
 	<exclude name="Squiz.Classes.ValidClassName" />
 	<exclude name="Generic.ControlStructures.InlineControlStructure" />
+	<exclude name="Squiz.PHP.DisallowSizeFunctionsInLoops" />
   </rule>
 
   <rule ref="Generic.Files.LineLength">
@@ -22,31 +23,6 @@
    		<property name="absoluteLineLimit" value="150"/>
   	</properties>
   </rule>
-
-
-
-
-  <!--
-<rule ref="Squiz.Classes.ValidClassName">
-    <type>warning</type>
-  </rule>
-  Temporarily ignore until API docblock formatting and line length issues in core code are fixed.
-  <rule ref="FHComplete.Commenting.FunctionComment.ParamCommentNotCapital">
-    <severity>0</severity>
-  </rule>
-  <rule ref="FHComplete.Commenting.FunctionComment.ParamCommentFullStop">
-    <severity>0</severity>
-  </rule>
-  <rule ref="FHComplete.Commenting.FunctionComment.ThrowsNotCapital">
-    <severity>0</severity>
-  </rule>
-  <rule ref="FHComplete.Commenting.FunctionComment.ThrowsNoFullStop">
-    <severity>0</severity>
-  </rule>
-  <rule ref="FHComplete.Commenting.FunctionComment.EmptyThrows">
-    <severity>0</severity>
-  </rule>
-  -->
   <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
 
   <rule ref="Squiz.Classes.LowercaseClassKeywords"/>