diff --git a/.travis.yml b/.travis.yml
index fa832fc592..43b137fa6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,9 @@ env:
     - JOB=test
 
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.28.1
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
 
 script:
-  # Babel doesn't build correctly with npm v2 (which comes bundled with Node v4)
-  # so we manually upgrade to a known working npm version.
-  - npm install --global npm@4
   - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
   - 'if [ "$JOB" = "lint" ]; then make lint && make flow; fi'
 
diff --git a/Makefile b/Makefile
index b60cee752a..c4d4315bc4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,14 +30,14 @@ watch: clean
 	make clean-lib
 	BABEL_ENV=development ./node_modules/.bin/gulp watch
 
-lint:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --rulesdir="./eslint_rules"
-
 flow:
 	./node_modules/.bin/flow check --strip-root
 
+lint:
+	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --rulesdir="./scripts/eslint_rules"
+
 fix:
-	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --fix --rulesdir="./eslint_rules"
+	./node_modules/.bin/eslint scripts $(SOURCES) *.js --format=codeframe --fix --rulesdir="./scripts/eslint_rules"
 
 clean: test-clean
 	rm -rf packages/babel-polyfill/browser*
diff --git a/circle.yml b/circle.yml
index ccf7c2c17a..31b3b4fddd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,8 +10,7 @@ machine:
 
 dependencies:
   pre:
-    # Version number can be removed once 0.28.x or higher is released as stable
-    - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.28.4
+    - curl -o- -L https://yarnpkg.com/install.sh | bash
   cache_directories:
     - ~/.yarn-cache
   override:
diff --git a/lerna.json b/lerna.json
index 823dc8e8d0..3fc62ca5d1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -28,5 +28,7 @@
     "packages/*",
     "codemods/*",
     "experimental/*"
-  ]
+  ],
+  "npmClient": "yarn",
+  "npmClientArgs": ["--no-lockfile"]
 }
diff --git a/package.json b/package.json
index f809e74e91..7d270abe75 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
   },
   "lint-staged": {
     "*.js": [
-      "eslint --format=codeframe --rulesdir='./eslint_rules'"
+      "eslint --format=codeframe --rulesdir='./scripts/eslint_rules'"
     ]
   }
 }
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index 7c1c52e3dd..c5661db82d 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -17,8 +17,6 @@
   ],
   "dependencies": {
     "babel-core": "7.0.0-beta.2",
-    "babel-polyfill": "7.0.0-beta.2",
-    "babel-register": "7.0.0-beta.2",
     "commander": "^2.8.1",
     "convert-source-map": "^1.1.0",
     "fs-readdir-recursive": "^1.0.0",
diff --git a/eslint_rules/no-undefined-identifier.js b/scripts/eslint_rules/no-undefined-identifier.js
similarity index 100%
rename from eslint_rules/no-undefined-identifier.js
rename to scripts/eslint_rules/no-undefined-identifier.js
diff --git a/scripts/grant-npm-owner.sh b/scripts/grant-npm-owner.sh
deleted file mode 100755
index a12d4dd63c..0000000000
--- a/scripts/grant-npm-owner.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-read -p "Username: " username
-
-for f in packages/*; do
-  package=`basename $f`
-
-  if [ -d "$f" ]; then
-    npm owner add $username $package
-  fi
-done