diff --git a/Gemfile b/Gemfile
index c77fc212e..2d10b744d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -120,9 +120,6 @@ group :development, :test do
   gem 'pry', '0.10.1'
 
   gem 'bullet',        '4.14.7' # for finding database optimizations
-  gem 'brakeman',      '3.6.1', require: false # for security audit'
-  # tmp, otherwise conflics with breakman
-  # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d'
   gem 'html2haml',     '2.1.0'
   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
diff --git a/Gemfile.lock b/Gemfile.lock
index ae8676ede..0782f93f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,7 +123,6 @@ GEM
     bootstrap-sass (3.3.5.1)
       autoprefixer-rails (>= 5.0.0.1)
       sass (>= 3.3.0)
-    brakeman (3.6.1)
     builder (3.2.3)
     bullet (4.14.7)
       activesupport (>= 3.0.0)
@@ -477,7 +476,6 @@ DEPENDENCIES
   airbrake
   autodoc
   bootstrap-sass (= 3.3.5.1)
-  brakeman (= 3.6.1)
   bullet (= 4.14.7)
   cancancan (= 1.11.0)
   capybara