diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index fb421026..b9fb3e90 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -47,29 +47,6 @@ class LoginController < ApplicationController
     logout_user
   end
 
-  def expire_session
-    # this is a hack to enable cucumber to expire a session by calling this
-    # method. The method will be unavailable for production environment
-    
-    @user.forget_me if logged_in?
-    cookies.delete :auth_token
-    session['user_id'] = nil
-    reset_session
-    
-    unless Rails.env.production?
-      session['expiry_time'] = Time.now
-      respond_to do |format|
-        format.html { render :text => "Session expired for test purposes"}
-        format.js { render :text => "" }
-      end
-    else
-      respond_to do |format|
-        format.html { render :text => "Not available for production use"}
-        format.js { render :text => "" }
-      end
-    end
-  end
-  
   def check_expiry
     # Gets called by periodically_call_remote to check whether
     # the session has timed out yet
diff --git a/config/routes.rb b/config/routes.rb
index 746c66cf..eb7213e0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,7 +4,6 @@ Tracksapp::Application.routes.draw do
   root :to => 'todos#index'
 
   match 'login' => 'login#login'
-  match 'login/expire_session' => 'login#expire_session'
   match 'login/check_expiry' => 'login#check_expiry'
   match 'logout' => 'login#logout'
 
diff --git a/features/support/tracks_login_helper.rb b/features/support/tracks_login_helper.rb
index f1a8ea2b..2e436d50 100644
--- a/features/support/tracks_login_helper.rb
+++ b/features/support/tracks_login_helper.rb
@@ -9,6 +9,14 @@ class SessionBackdoorController < ::ApplicationController
     cookies[:auth_token] = { :value => user.remember_token, :expires => user.remember_token_expires_at }
     redirect_to root_path
   end
+
+  def expire_session
+    current_user.forget_me if logged_in?
+    cookies.delete :auth_token
+    session['user_id'] = nil
+    reset_session
+    session['expiry_time'] = Time.now
+  end
 end
 
 module TracksLoginHelper
@@ -20,6 +28,7 @@ module TracksLoginHelper
     _routes.draw do
       # here you can add any route you want
       match "/test_login_backdoor", to: "session_backdoor#create"
+      match "login/expire_session", to: "session_backdoor#expire_session"
     end
     ActiveSupport.on_load(:action_controller) { _routes.finalize! }
   ensure