diff --git a/.travis.yml b/.travis.yml
index 3dcfca8e..5d1f97c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,11 @@
 # See: https://blog.travis-ci.com/2017-12-12-new-trusty-images-q4-launch
 group: deprecated-2017Q4
 
+# Only build master branch (if not a PR)
+branches:
+  only:
+  - master
+
 os:
   - linux
   - osx
diff --git a/conda-build-all b/conda-build-all
index e76369f2..324f2a2e 100755
--- a/conda-build-all
+++ b/conda-build-all
@@ -425,12 +425,13 @@ def build_package(m, python, numpy, args):
 
     if args.upload is not None:
         if (retcode == 0):
+            print('Package build succeeded. Uploading to anaconda for user "%s".' % str(args.upload))
             upload_to_binstar(m, python, numpy, username=args.upload,
                               force=args.force, dev=args.dev)
         else:
             print('Package failed to build (return code %s); will not upload.' % str(retcode))
 
-    #clean_builds()
+    clean_builds()
 
     sys.stdout.flush()
     return retcode