diff --git a/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/colorizer/SwiftCodeColorizerFormat.java b/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/colorizer/SwiftCodeColorizerFormat.java
deleted file mode 100644
index de1d223f..00000000
--- a/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/colorizer/SwiftCodeColorizerFormat.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * backelite-sonar-swift-plugin - Enables analysis of Swift projects into SonarQube.
- * Copyright © 2015 Backelite (${email})
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.sonar.plugins.swift.colorizer;
-
-import com.google.common.collect.ImmutableList;
-import org.sonar.api.web.CodeColorizerFormat;
-import org.sonar.colorizer.*;
-import org.sonar.plugins.swift.lang.api.SwiftKeyword;
-import org.sonar.plugins.swift.lang.core.Swift;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by gillesgrousset on 27/10/2015.
- */
-public class SwiftCodeColorizerFormat extends CodeColorizerFormat {
-
-    public SwiftCodeColorizerFormat() {
-        super(Swift.KEY);
-    }
-
-    @Override
-    public List<Tokenizer> getTokenizers() {
-        /*return ImmutableList.of(
-                new StringTokenizer("<span class=\"s\">", "</span>"),
-                new CDocTokenizer("<span class=\"cd\">", "</span>"),
-                new JavadocTokenizer("<span class=\"cppd\">", "</span>"),
-                new CppDocTokenizer("<span class=\"cppd\">", "</span>"),
-                new KeywordsTokenizer("<span class=\"k\">", "</span>", SwiftKeyword.keywordValues()));*/
-        return new ArrayList<Tokenizer>();
-
-    }
-}
diff --git a/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java b/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java
index d33a988a..19943fa6 100644
--- a/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java
+++ b/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java
@@ -20,7 +20,6 @@
 import org.slf4j.LoggerFactory;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
-import org.sonar.api.measures.PersistenceMode;
 import org.sonar.api.measures.RangeDistributionBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -125,7 +124,6 @@ private List<Measure> buildMeasureList(int complexity, double fileComplexity, in
         list.add(new Measure(CoreMetrics.FILE_COMPLEXITY, fileComplexity));
         RangeDistributionBuilder complexityDistribution = new RangeDistributionBuilder(CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION, FILES_DISTRIB_BOTTOM_LIMITS);
         complexityDistribution.add(fileComplexity);
-        list.add(complexityDistribution.build().setPersistenceMode(PersistenceMode.MEMORY));
         return list;
     }
 
@@ -175,7 +173,6 @@ public List<Measure> buildFuncionMeasuresList(double complexMean, int complexity
         List<Measure> list = new ArrayList<Measure>();
         list.add(new Measure(CoreMetrics.FUNCTION_COMPLEXITY, complexMean));
         list.add(new Measure(CoreMetrics.COMPLEXITY_IN_FUNCTIONS).setIntValue(complexityInFunctions));
-        list.add(builder.build().setPersistenceMode(PersistenceMode.MEMORY));
         return list;
     }
 
diff --git a/sonar-swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java b/sonar-swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java
index 414e4012..c4a9d504 100644
--- a/sonar-swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java
+++ b/sonar-swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java
@@ -131,7 +131,7 @@ public void parseReportShouldReturnMapWhenXMLFileIsCorrect() {
 
         assertTrue("Key is not there", report.containsKey("App/Controller/Accelerate/AccelerationViewController.h"));
         List<Measure> list1 = report.get("App/Controller/Accelerate/AccelerationViewController.h");
-        assertEquals(4, list1.size());
+        assertEquals(3, list1.size());
 
         for (Measure measure : list1) {
             String s = measure.getMetric().getKey();
@@ -152,7 +152,7 @@ public void parseReportShouldReturnMapWhenXMLFileIsCorrect() {
         assertTrue("Key is not there", report.containsKey("App/Controller/Accelerate/AccelerationViewController.m"));
 
         List<Measure> list2 = report.get("App/Controller/Accelerate/AccelerationViewController.m");
-        assertEquals(7, list2.size());
+        assertEquals(5, list2.size());
         for (Measure measure : list2) {
             String s = measure.getMetric().getKey();