diff --git a/Gemfile b/Gemfile
index a58648a1c..8b44ed221 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,8 +87,6 @@ end
 
 group :development, :test do
   gem 'pry', '0.10.1'
-
-  gem 'bullet',        '4.14.7' # for finding database optimizations
   gem 'sdoc',          '0.4.1'  # bundle exec rake doc:rails generates the API under doc/api.
   gem 'railroady',     '1.3.0'  # to generate database diagrams
   gem 'autodoc'
diff --git a/Gemfile.lock b/Gemfile.lock
index cc822dab7..913d40e2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,9 +119,6 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     builder (3.2.3)
-    bullet (4.14.7)
-      activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.9.0)
     cancancan (3.0.1)
     capybara (3.29.0)
       addressable
@@ -393,7 +390,6 @@ GEM
       unf_ext
     unf_ext (0.0.7.2)
     unicode_utils (1.4.0)
-    uniform_notifier (1.9.0)
     uuidtools (2.1.5)
     validates_email_format_of (1.6.3)
       i18n
@@ -428,7 +424,6 @@ DEPENDENCIES
   airbrake
   autodoc
   bootstrap-sass (~> 3.4)
-  bullet (= 4.14.7)
   cancancan
   capybara
   coderay (= 1.1.0)
diff --git a/config/environments/development.rb.sample b/config/environments/development.rb.sample
index 59efe01d9..f5ed70e06 100644
--- a/config/environments/development.rb.sample
+++ b/config/environments/development.rb.sample
@@ -32,16 +32,6 @@ Rails.application.configure do
   config.assets.raise_runtime_errors = true
 
   config.action_view.raise_on_missing_translations = true
-
-  # for finding database optimization
-  config.after_initialize do
-    Bullet.enable = true
-    Bullet.bullet_logger = true
-    Bullet.console = true
-    Bullet.rails_logger = true
-    Bullet.add_footer = true
-    Bullet.unused_eager_loading_enable = false
-  end
 end
 
 # In this mode, any jobs you queue will be run in the same thread, synchronously