diff --git a/app/controllers/kalibro_configurations_controller.rb b/app/controllers/kalibro_configurations_controller.rb
index 2e22bb6..b45dfa7 100644
--- a/app/controllers/kalibro_configurations_controller.rb
+++ b/app/controllers/kalibro_configurations_controller.rb
@@ -54,12 +54,14 @@ class KalibroConfigurationsController < ApplicationController
   # DELETE /kalibro_configurations/1.json
   def destroy
     set_kalibro_configuration
-    current_user.kalibro_configuration_attributes.find_by_kalibro_configuration_id!(@kalibro_configuration.id).destroy
+
     @kalibro_configuration.destroy
+
     respond_to do |format|
       format.html { redirect_to kalibro_configurations_url }
       format.json { head :no_content }
     end
+
     Rails.cache.delete("#{@kalibro_configuration.id}_metrics")
   end
 
diff --git a/features/step_definitions/kalibro_configuration_steps.rb b/features/step_definitions/kalibro_configuration_steps.rb
index ba51faf..6cc56ec 100644
--- a/features/step_definitions/kalibro_configuration_steps.rb
+++ b/features/step_definitions/kalibro_configuration_steps.rb
@@ -51,6 +51,7 @@ Then(/^I should be in the All configurations page$/) do
 end
 
 Then(/^the sample configuration should not be there$/) do
+  expect(@kalibro_configuration.attributes).to be_nil
   expect { KalibroConfiguration.find(@kalibro_configuration.id) }.to raise_error
 end
 
diff --git a/spec/controllers/kalibro_configurations_controller_spec.rb b/spec/controllers/kalibro_configurations_controller_spec.rb
index a0c4821..5e151a3 100644
--- a/spec/controllers/kalibro_configurations_controller_spec.rb
+++ b/spec/controllers/kalibro_configurations_controller_spec.rb
@@ -91,7 +91,6 @@ describe KalibroConfigurationsController, :type => :controller do
 
     context 'with an User logged in' do
       let(:kalibro_configuration_attribute) { FactoryGirl.build(:kalibro_configuration_attributes) }
-      let(:kalibro_configuration_attributes) { mock('kalibro_configuration_attributes') }
 
       before do
         sign_in FactoryGirl.create(:user)
@@ -99,16 +98,10 @@ describe KalibroConfigurationsController, :type => :controller do
 
       context 'when the user owns the kalibro_configuration' do
         before :each do
-          kalibro_configuration_attribute.expects(:destroy)
           kalibro_configuration.expects(:destroy)
-
-          #Those two mocks looks the same but they are necessary since params[:id] is a String and @configuration.id is an Integer :(
-          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id).with("#{kalibro_configuration.id}").returns(kalibro_configuration_attribute)
-          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id!).with(kalibro_configuration.id).returns(kalibro_configuration_attribute)
-
-          User.any_instance.expects(:kalibro_configuration_attributes).at_least_once.returns(kalibro_configuration_attributes)
-
           KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration)
+          subject.expects(:kalibro_configuration_owner?)
+
           delete :destroy, :id => kalibro_configuration.id
         end
 
@@ -121,9 +114,6 @@ describe KalibroConfigurationsController, :type => :controller do
 
       context "when the user doesn't own the kalibro_configuration" do
         before :each do
-          kalibro_configuration_attributes.expects(:find_by_kalibro_configuration_id).with("#{kalibro_configuration.id}").returns(nil)
-          User.any_instance.expects(:kalibro_configuration_attributes).at_least_once.returns(kalibro_configuration_attributes)
-
           delete :destroy, :id => kalibro_configuration.id
         end
 
--
libgit2 0.21.2