diff --git a/Gemfile b/Gemfile
index 2f65996c6..abd96c37b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,10 +7,8 @@ gem 'rails', '3.2.2'
 
 gem 'foreman', '0.41'
 
-gem 'whenever' #why is this in the bundle
-
+gem 'thin', '~> 1.3.1',    :require => false
 gem 'rails_autolink'
-gem 'thin', '~> 1.3.1',    :require => false #why is this here?
 
 # cross-origin resource sharing
 
@@ -39,9 +37,10 @@ gem "rpm_contrib", "~> 2.1.7"
 
 group :production do # we don't install these on travis to speed up test runs
   gem 'rails_admin', '~> 0.0.3'
+  gem 'fastercsv', '1.5.4', :require => false
   gem 'rack-ssl', :require => 'rack/ssl'
   gem 'rack-rewrite', '~> 1.2.1', :require => false
-  gem 'rack-piwik', :require => 'rack/piwik'
+  gem 'rack-piwik', :require => 'rack/piwik', :require => false
 end
 
 # configuration
@@ -64,7 +63,6 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 
 gem 'carrierwave', '0.6.2'
 gem 'fog'
-gem 'fastercsv', '1.5.4', :require => false
 gem 'mini_magick', '3.4'
 
 # JSON and API
@@ -158,16 +156,12 @@ group :test do
   gem 'selenium-webdriver', '2.22.0.rc1'
 
   gem 'webmock', '~> 1.7', :require => false
-  gem 'sqlite3'
-  gem 'mock_redis'
 
   gem 'spork', '~> 1.0rc2'
   gem 'guard-rspec'
   gem 'guard-spork'
   gem 'guard-cucumber'
 
-
-  gem 'mongrel', :require => false, :platforms => :ruby_18 #why
 end
 
 group :test, :development do
@@ -182,10 +176,8 @@ group :development do
   gem 'capistrano_colors', :require => false
   gem 'capistrano-ext', :require => false
   gem 'linecache', '0.46', :platforms => :mri_18
-  gem 'parallel_tests', :require => false
   gem 'yard', :require => false
 
-
   # for tracing AR object instantiation and memory usage per request
   gem 'oink'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d1fcd4009..8ee187bfa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,10 +99,8 @@ GEM
     carrierwave (0.6.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    cgi_multipart_eof_fix (2.5.0)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
-    chronic (0.6.7)
     client_side_validations (3.1.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -153,7 +151,6 @@ GEM
     faraday_middleware (0.8.7)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.4)
-    fastthread (1.0.7)
     ffi (1.0.11)
     fixture_builder (0.3.3)
       activerecord (>= 2)
@@ -177,7 +174,6 @@ GEM
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
-    gem_plugin (0.2.3)
     gherkin (2.10.0)
       json (>= 1.4.6)
     gon (3.0.2)
@@ -256,12 +252,6 @@ GEM
     mobile-fu (1.1.0)
       rack-mobile-detect
       rails
-    mock_redis (0.4.1)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
     multi_json (1.0.4)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
@@ -298,9 +288,6 @@ GEM
     omniauth-twitter (0.0.9)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.0.7)
-    parallel (0.5.16)
-    parallel_tests (0.8.1)
-      parallel
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -419,7 +406,6 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
     subexec (0.2.2)
     thin (1.3.1)
       daemons (>= 1.0.9)
@@ -453,9 +439,6 @@ GEM
     webmock (1.8.7)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    whenever (0.7.3)
-      activesupport (>= 2.3.4)
-      chronic (~> 0.6.3)
     will_paginate (3.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -511,8 +494,6 @@ DEPENDENCIES
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 3.4)
   mobile-fu
-  mock_redis
-  mongrel
   mysql2 (= 0.3.11)
   newrelic_rpm
   nokogiri (= 1.5.2)
@@ -521,7 +502,6 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-tumblr
   omniauth-twitter
-  parallel_tests
   pg
   rack-cors (~> 0.2.4)
   rack-piwik
@@ -547,7 +527,6 @@ DEPENDENCIES
   selenium-webdriver (= 2.22.0.rc1)
   settingslogic!
   spork (~> 1.0rc2)
-  sqlite3
   thin (~> 1.3.1)
   timecop
   twitter (= 2.0.2)
@@ -555,6 +534,5 @@ DEPENDENCIES
   uglifier
   unicorn (~> 4.3.0)
   webmock (~> 1.7)
-  whenever
   will_paginate
   yard