diff --git a/conf/nginx-local.conf b/conf/nginx-local.conf
deleted file mode 100644
index 0545399a0..000000000
--- a/conf/nginx-local.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-include root-base.conf;
-
-worker_processes 2;
-
-http {
-    include http-base.conf;
-
-    server {
-        include server-base.conf;
-
-        listen 5000 default;
-
-        location /static/ {
-            # checks for static file, if not found proxy to app
-            alias /home/jake/Projects/docker/quay/static/;
-        }
-    }
-}
diff --git a/conf/nginx-staging.conf b/conf/nginx-staging.conf
deleted file mode 100644
index f8fb03784..000000000
--- a/conf/nginx-staging.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-include root-base.conf;
-
-worker_processes 2;
-
-user root nogroup;
-
-http {
-    include http-base.conf;
-
-    include hosted-http-base.conf;
-
-    server {
-        include server-base.conf;
-
-        listen 443 default;
-
-        ssl on;
-        ssl_certificate ./certs/quay-staging-unified.cert;
-        ssl_certificate_key ./certs/quay-staging.key;
-        ssl_session_timeout 5m;
-        ssl_protocols SSLv3 TLSv1;
-        ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-        ssl_prefer_server_ciphers on;
-
-        location /static/ {
-            # checks for static file, if not found proxy to app
-            alias /root/quay/static/;
-        }
-    }
-}
diff --git a/conf/nginx.conf b/conf/nginx.conf
deleted file mode 100644
index 896b151de..000000000
--- a/conf/nginx.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-include root-base.conf;
-
-worker_processes 8;
-
-user nobody nogroup;
-
-http {
-    include http-base.conf;
-
-    include hosted-http-base.conf;
-
-    server {
-        include server-base.conf;
-
-        listen 443 default;
-
-        ssl on;
-        ssl_certificate ./certs/quay-unified.cert;
-        ssl_certificate_key ./certs/quay.key;
-        ssl_session_timeout 5m;
-        ssl_protocols SSLv3 TLSv1;
-        ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
-        ssl_prefer_server_ciphers on;
-
-        location /static/ {
-            # checks for static file, if not found proxy to app
-            alias /home/ubuntu/quay/static/;
-        }
-    }
-}
diff --git a/templates/base.html b/templates/base.html
index b1c851076..482264242 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -59,6 +59,8 @@
 
     <script src="//cdn.jsdelivr.net/g/bootbox@4.1.0,underscorejs@1.5.2,restangular@1.2.0,d3js@3.3.3,momentjs"></script>
 
+    <script src="https://checkout.stripe.com/checkout.js"></script>
+
     {% for script_path in library_scripts %}
       <script src="/static/{{ script_path }}?v={{ cache_buster }}"></script>
     {% endfor %}
diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py
index 2d7d31d84..66910fc92 100644
--- a/workers/dockerfilebuild.py
+++ b/workers/dockerfilebuild.py
@@ -352,17 +352,23 @@ class DockerfileBuildContext(object):
           # We can forget about this particular tag if it was indeed one of our renamed tags
           self.private_repo_tags.discard(tag)
 
-        verify_removed.add(image_id)
+          try:
+            self._build_cl.remove_image(tag)
+          except APIError:
+            # Sometimes an upstream image removed this one
+            pass
+
         try:
           self._build_cl.remove_image(image_id)
         except APIError:
           # Sometimes an upstream image removed this one
           pass
+        verify_removed.add(image_id)
 
     # Verify that our images were actually removed
     for image in self._build_cl.images():
       if image['Id'] in verify_removed:
-        raise RuntimeError('Image was not removed: %s' % image['Id'])
+        logger.warning('Image was not removed: %s' % image['Id'])
 
   def __cleanup(self):
     # Iterate all of the images and rename the ones that aren't public. This should preserve