diff --git a/lib/search.rb b/app/models/search.rb
similarity index 100%
rename from lib/search.rb
rename to app/models/search.rb
diff --git a/config/initializers/bonsai.rb b/config/initializers/bonsai.rb
deleted file mode 100644
index 6276239c..00000000
--- a/config/initializers/bonsai.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-if ENV['ELASTICSEARCH_URL']
-  Tire.configure { logger $stdout, :level => (ENV['ELASTICSEARCH_LOG_LEVEL'] || 'debug') }
-  Tire.configure do
-    url ENV['ELASTICSEARCH_URL']
-  end
-  BONSAI_INDEX_NAME = ENV['ELASTICSEARCH_INDEX']
-elsif ENV['BONSAI_INDEX_URL']
-  Tire.configure { logger $stdout, :level => (ENV['ELASTICSEARCH_LOG_LEVEL'] || 'debug') }
-  Tire.configure do
-    url "http://index.bonsai.io"
-  end
-  BONSAI_INDEX_NAME = ENV['BONSAI_INDEX_URL'][/[^\/]+$/]
-else
-  Tire.configure { logger Rails.root + "log/tire_#{Rails.env}.log" }
-  app_name = Rails.application.class.parent_name.underscore.dasherize
-  BONSAI_INDEX_NAME = "#{app_name}-#{Rails.env}"
-end
\ No newline at end of file
diff --git a/config/initializers/tire.rb b/config/initializers/tire.rb
new file mode 100644
index 00000000..b5967957
--- /dev/null
+++ b/config/initializers/tire.rb
@@ -0,0 +1,3 @@
+Tire.configure do
+  url ENV['ELASTICSEARCH_URL']
+end