diff --git a/acceptance_tests/Gemfile b/acceptance_tests/Gemfile
index d0cb8fb..8060e0d 100644
--- a/acceptance_tests/Gemfile
+++ b/acceptance_tests/Gemfile
@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gem 'cucumber'
 gem 'capybara'
-gem 'poltergeist'
 gem 'rspec'
-gem 'phantomjs'
+gem 'poltergeist'
+gem 'phantomjs', :group => :test
 gem 'show_me_the_cookies'
 gem 'yard-cucumber'
-gem 'selenium-webdriver', '2.45.0'
\ No newline at end of file
+gem 'selenium-webdriver', '2.45.0'
diff --git a/acceptance_tests/features/support/env.rb b/acceptance_tests/features/support/env.rb
index 68d2a55..26c1b00 100644
--- a/acceptance_tests/features/support/env.rb
+++ b/acceptance_tests/features/support/env.rb
@@ -4,6 +4,7 @@
 require 'rspec'
 require 'show_me_the_cookies'
 require 'capybara/poltergeist'
+require 'phantomjs'
 # require 'selenium-webdriver'
 
 require 'yaml'
@@ -26,6 +27,9 @@
   end
 else
   Capybara.run_server = false
+  Capybara.register_driver :poltergeist do |app|
+    Capybara::Poltergeist::Driver.new(app, :phantomjs => Phantomjs.path)
+  end
   Capybara.default_driver = :poltergeist
 end
 
@@ -66,4 +70,4 @@ def rest
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-end
\ No newline at end of file
+end
diff --git a/app.js b/app.js
index 636f437..766086e 100644
--- a/app.js
+++ b/app.js
@@ -6,8 +6,7 @@ var path = require('path');
 var logger = require('./lib/logger');
 var churchill = require('churchill');
 var session = require('express-session');
-var redis = require('redis');
-var RedisStore = require('connect-redis-crypto')(session);
+
 var config = require('./config');
 require('moment-business');
 
@@ -45,6 +44,8 @@ app.set('trust proxy', 1);
 /*************************************/
 /******* Redis session storage *******/
 /*************************************/
+var redis = require('redis');
+var RedisStore = require('connect-redis-crypto')(session);
 var client = redis.createClient(config.redis.port, config.redis.host);
 
 client.on('connecting', function redisConnecting() {
diff --git a/apps/common/translations/en/default.json b/apps/common/translations/en/default.json
deleted file mode 100644
index 6dd5158..0000000
--- a/apps/common/translations/en/default.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"buttons": {
-		"continue": "Continue",
-		"send": "Send",
-		"change": "Change",
-		"close": "Close",
-		"Confirm": "Confirm submission"
-	},
-	"errorlist": {
-		"title": {
-			"single": "Please fix the following error",
-			"multiple": "Please fix the following errors"
-		}
-	},
-	"errors": {
-		"404": {
-			"title": "Page not found",
-			"description": "This page does not exist"
-		},
-		"default": {
-			"title": "Sorry, something went wrong",
-			"message": "A server exception occurred. Please try again."
-		},
-		"session": {
-			"title": "Sorry, you'll have to start again",
-			"message": "You haven't entered any details for 20 minutes, so we have cleared your information to keep it secure."
-		},
-		"cookies-required": {
-			"title": "Cookies are required to use this service",
-			"message": "Cookies are required in order to use the BRP service.<br /><br /> Please <a href=\"http://www.aboutcookies.org/how-to-control-cookies/\" rel=\"external\">enable cookies</a> and try again. Find out <a href=\"/cookies\">how to we use cookies</a>."
-		}
-	}
-}
\ No newline at end of file