diff --git a/aws_run_celery.py b/aws_run_celery.py
index 36a1f480a..8194528db 100644
--- a/aws_run_celery.py
+++ b/aws_run_celery.py
@@ -1,11 +1,5 @@
 #!/usr/bin/env python
-from app import notify_celery, create_app
-from credstash import getAllSecrets
-import os
-
-# On AWS get secrets and export to env, skip this on Cloud Foundry
-if os.getenv('VCAP_SERVICES') is None:
-    os.environ.update(getAllSecrets(region="eu-west-1"))
+from app import create_app
 
 application = create_app("delivery")
 application.app_context().push()
diff --git a/db.py b/db.py
index 3a8da01d4..bc558cbd2 100644
--- a/db.py
+++ b/db.py
@@ -1,12 +1,8 @@
 from flask.ext.script import Manager, Server
 from flask_migrate import Migrate, MigrateCommand
-from app import create_app, db
-from credstash import getAllSecrets
-import os
 
-# On AWS get secrets and export to env, skip this on Cloud Foundry
-if os.getenv('VCAP_SERVICES') is None:
-    os.environ.update(getAllSecrets(region="eu-west-1"))
+from app import create_app, db
+
 
 application = create_app()
 
diff --git a/requirements.txt b/requirements.txt
index 0c9b3f1e0..61390b6c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@ marshmallow==2.4.2
 marshmallow-sqlalchemy==0.8.0
 flask-marshmallow==0.6.2
 Flask-Bcrypt==0.6.2
-credstash==1.8.0
 boto3==1.4.4
 celery==3.1.25 # pyup: <4
 monotonic==1.2
diff --git a/server_commands.py b/server_commands.py
index 85bf13137..af071db47 100644
--- a/server_commands.py
+++ b/server_commands.py
@@ -1,7 +1,6 @@
 from flask.ext.script import Manager, Server
 from flask_migrate import Migrate, MigrateCommand
 from app import (create_app, db, commands)
-from credstash import getAllSecrets
 import os
 
 default_env_file = '/home/ubuntu/environment'
@@ -11,10 +10,6 @@ if os.path.isfile(default_env_file):
     with open(default_env_file, 'r') as environment_file:
         environment = environment_file.readline().strip()
 
-# On AWS get secrets and export to env, skip this on Cloud Foundry
-if os.getenv('VCAP_SERVICES') is None:
-    os.environ.update(getAllSecrets(region="eu-west-1"))
-
 from app.config import configs
 
 os.environ['NOTIFY_API_ENVIRONMENT'] = configs[environment]
diff --git a/wsgi.py b/wsgi.py
index 2df2c3976..9fbeb28ac 100644
--- a/wsgi.py
+++ b/wsgi.py
@@ -1,13 +1,6 @@
-import os
-
 from app import create_app
-from credstash import getAllSecrets
 
 
-# On AWS get secrets and export to env, skip this on Cloud Foundry
-if os.getenv('VCAP_SERVICES') is None:
-    os.environ.update(getAllSecrets(region="eu-west-1"))
-
 application = create_app()
 
 if __name__ == "__main__":