diff --git a/plugins/mezuro/lib/kalibro/entities/metric_result.rb b/plugins/mezuro/lib/kalibro/entities/metric_result.rb
index 0853d6d..86fa84c 100644
--- a/plugins/mezuro/lib/kalibro/entities/metric_result.rb
+++ b/plugins/mezuro/lib/kalibro/entities/metric_result.rb
@@ -5,9 +5,9 @@ class Kalibro::Entities::MetricResult < Kalibro::Entities::Entity
   def metric=(value)
     if value.kind_of?(Hash)
       if value.has_key?(:script)
-        @metric = to_entity(value, Kalibro::Entities::CompoundMetric)
+        @metric = to_entity(value, Kalibro::CompoundMetric)
       else
-        @metric = to_entity(value, Kalibro::Entities::NativeMetric)
+        @metric = to_entity(value, Kalibro::NativeMetric)
       end
     else
       @metric = value
diff --git a/plugins/mezuro/lib/kalibro/module_result.rb b/plugins/mezuro/lib/kalibro/module_result.rb
index 697bc0f..2a13cb8 100644
--- a/plugins/mezuro/lib/kalibro/module_result.rb
+++ b/plugins/mezuro/lib/kalibro/module_result.rb
@@ -22,7 +22,7 @@ class Kalibro::ModuleResult < Kalibro::Model
         :project_name => project_name, 
         :module_name => module_name,
       })[:module_result]
-    to_entity_array(response)
+    to_objects_array(response)
   end
   
   #FIXME change Kalibro::Entities::Module
@@ -45,15 +45,6 @@ class Kalibro::ModuleResult < Kalibro::Model
   end
   
   private
-  
-  def self.to_entity_array(value)
-    array = value.kind_of?(Array) ? value : [value]
-    array.each.collect { |element| to_entity(element) }
-  end
-
-  def self.to_entity(value)
-    value.kind_of?(Hash) ? new(value) : value
-  end
 
   def self.date_with_milliseconds(date)
     milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s
diff --git a/plugins/mezuro/test/fixtures/module_result_fixtures.rb b/plugins/mezuro/test/fixtures/module_result_fixtures.rb
index 4e1618e..cc8e85c 100644
--- a/plugins/mezuro/test/fixtures/module_result_fixtures.rb
+++ b/plugins/mezuro/test/fixtures/module_result_fixtures.rb
@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/compound_metric_with_error_fixtures'
 class ModuleResultFixtures
 
   def self.module_result
-    fixture = Kalibro::ModuleResult.new( module_result_hash )
+    Kalibro::ModuleResult.new( module_result_hash )
   end
 
   def self.module_result_hash
--
libgit2 0.21.2