diff --git a/Gemfile b/Gemfile
index ace4c1c0..2a04da65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,6 @@ gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: '
 gem 'sinatra'          #github: 'sinatra/sinatra'
 gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
 
-# TODO need to release the gem as soon i'm certain this change makes sense
-gem 'simple_states',      github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'
-
 gem 'puma', '1.6.3'
 gem "sentry-raven",    github: 'getsentry/raven-ruby'
 gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2442ce34..43f84ed8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,15 +34,6 @@ GIT
     yard-sinatra (1.0.0)
       yard (~> 0.7)
 
-GIT
-  remote: git://github.com/svenfuchs/simple_states.git
-  revision: b1d45144e6a758220d7b21f83b08dc92de0d3196
-  branch: sf-set-state-early
-  specs:
-    simple_states (0.1.1)
-      activesupport
-      hashr (~> 0.0.10)
-
 GIT
   remote: git://github.com/travis-ci/octopus.git
   revision: 2d4cca475479516f47c3144971205f50c335ad35
@@ -252,6 +243,9 @@ GEM
       redis (~> 3)
       redis-namespace
     signature (0.1.7)
+    simple_states (0.1.1)
+      activesupport
+      hashr (~> 0.0.10)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -306,7 +300,6 @@ DEPENDENCIES
   rerun
   rspec (~> 2.11)
   sentry-raven!
-  simple_states!
   sinatra
   sinatra-contrib
   travis-api!