diff --git a/lib/Config/Analytics.php b/lib/Config/Analytics.php
index 07e1ea7c97..9383361d0c 100644
--- a/lib/Config/Analytics.php
+++ b/lib/Config/Analytics.php
@@ -10,8 +10,7 @@ class Analytics {
   }
 
   function init() {
-    // review: this creates a fatal error when mailpoet tables are dropped.
-    //add_action('admin_enqueue_scripts', array($this, 'setupAdminDependencies'));
+    add_action('admin_enqueue_scripts', array($this, 'setupAdminDependencies'));
   }
 
   function setupAdminDependencies() {
diff --git a/lib/Subscribers/ImportExport/ImportExportFactory.php b/lib/Subscribers/ImportExport/ImportExportFactory.php
index 9c5f4c6fb1..c1853c5508 100644
--- a/lib/Subscribers/ImportExport/ImportExportFactory.php
+++ b/lib/Subscribers/ImportExport/ImportExportFactory.php
@@ -34,10 +34,6 @@ class ImportExportFactory {
       'last_name' => __('Last name'),
       'status' => __('Status')
       // TODO: add additional fields from MP2
-      /*
-            'confirmed_ip' => __('IP address')
-            'confirmed_at' => __('Subscription date')
-      */
     );
   }
 
@@ -137,4 +133,4 @@ class ImportExportFactory {
     }
     return $data;
   }
-}
\ No newline at end of file
+}
diff --git a/tasks/code_sniffer/MailPoet/ruleset.xml b/tasks/code_sniffer/MailPoet/ruleset.xml
index 34148ae790..35681ed6bf 100644
--- a/tasks/code_sniffer/MailPoet/ruleset.xml
+++ b/tasks/code_sniffer/MailPoet/ruleset.xml
@@ -106,7 +106,11 @@
   <rule ref="Squiz.ControlStructures.ForLoopDeclaration"/>
 
   <!-- There should not be commented out code -->
-  <rule ref="Squiz.PHP.CommentedOutCode"/>
+  <rule ref="Squiz.PHP.CommentedOutCode">
+    <properties>
+      <property name="maxPercentage" value="50"/>
+    </properties>
+  </rule>
   <!-- Discourage use of debug functions -->
   <rule ref="Squiz.PHP.DiscouragedFunctions"/>
   <!-- Discourage use of eval -->