diff --git a/lib/strokedb/store.rb b/lib/strokedb/store.rb
index 6e98b8d7..508b1109 100644
--- a/lib/strokedb/store.rb
+++ b/lib/strokedb/store.rb
@@ -39,20 +39,7 @@ def head_version(uuid)
     def save!(doc)
       next_timestamp!
       storage.save!(doc, timestamp)
-      
       update_views!(doc)
-      
-      # TODO: remove this shit 
-      if @index_store
-        if doc.previous_version
-          raw_pdoc = find(doc.uuid,doc.previous_version,:no_instantiation => true)
-          pdoc = Document.from_raw(self,raw_pdoc.freeze,:skip_callbacks => true)
-          pdoc.extend(VersionedDocument)
-          @index_store.delete(pdoc)
-        end
-        @index_store.insert(doc)
-        @index_store.save!
-      end
     end  
 
     def save_as_head!(doc)
diff --git a/spec/integration/search_spec.rb b/spec/integration/search_spec.rb
deleted file mode 100644
index cdf85025..00000000
--- a/spec/integration/search_spec.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "Database search" do
-  
-  before(:all) do
-    @path = File.dirname(__FILE__) + "/../temp/storages/database_search"
-    FileUtils.rm_rf @path
-    @f_storage = FileStorage.new(:path => @path + "/storage")
-    @f_storage.clear!
-    @index_storage = InvertedListFileStorage.new(:path => @path+"/index")
-    @index_storage.clear!
-    @index  = InvertedListIndex.new(@index_storage)
-    @index2 = InvertedListIndex.new(@index_storage)
-    
-    @f_store = Store.new(:storage => @f_storage, :index => @index, :path => @path + '/store')
-    @index.document_store = @f_store
-    @index2.document_store = @f_store
-    
-    @profile_meta = Document.create!(@f_store, :name => 'Profile', 
-                                               :non_indexable_slots => [ :bio, :version, :previous_version ])
-  end
-  
-  # Leave for investigation
-  # after(:all) do
-  #   FileUtils.rm_rf @path
-  # end
-  
-  it "should add new doc" do
-    doc = Document.create!(@f_store, :name => "Oleg", :state => 'Russia', :age => 21, Meta => @profile_meta)
-    doc.uuid.should_not be_nil
-    @oleg_uuid = doc.uuid
-    results = @index.find(:name => "Oleg")
-    results.should_not be_empty
-    results[0].uuid.should == @oleg_uuid
-  end
-  
-  it "should find doc in a separate index instance" do
-    results = @index2.find(:name => "Oleg", Meta => @profile_meta)
-    results.should_not be_empty
-    results[0]["name"].should == "Oleg"
-  end
-  
-  it "should store & find several docs" do
-    doc = Document.create!(@f_store, :name => "Yurii", :state => 'Ukraine', Meta => @profile_meta)
-    doc.save!
-    @yura_uuid = doc.uuid
-    results = @index.find(:name => "Yurii")
-    results.should_not be_empty
-    results[0].uuid.should == @yura_uuid
-  end
-
-  it "should find all profiles" do
-    results = @index.find(Meta => @profile_meta)
-    results.should_not be_empty
-    results.map{|e| e.uuid}.to_set == [ @yura_uuid, @oleg_uuid ].to_set 
-  end
-  
-  it "should find all profiles from Ukraine" do
-    results = @index.find(Meta => @profile_meta, :state => 'Ukraine')
-    results.should_not be_empty
-    results.map{|e| e.uuid}.to_set == [ @yura_uuid ].to_set 
-  end
-  
-  it "should remove info from index" do
-    results = @index.find(:name => 'Oleg')
-    oleg = results[0]
-    oleg[:name] = 'Oleganza'
-    oleg.save!
-    results = @index.find(:name => 'Oleg')
-    results.should be_empty
-    results = @index.find(:name => 'Oleganza')
-    results[0].uuid.should == oleg.uuid
-  end
-  
-end
-