diff --git a/client/next-dev.js b/client/next-dev.js
index f46e8855..0fc62c70 100644
--- a/client/next-dev.js
+++ b/client/next-dev.js
@@ -1,6 +1,4 @@
 import 'react-hot-loader/patch'
 import * as next from './next'
-import { requireModule } from '../lib/eval-script'
 
 window.next = next
-module.exports = requireModule
diff --git a/client/next.js b/client/next.js
index cb6389eb..0c2b7604 100644
--- a/client/next.js
+++ b/client/next.js
@@ -5,7 +5,7 @@ import domready from 'domready'
 import { rehydrate } from '../lib/css'
 import Router from '../lib/router'
 import App from '../lib/app'
-import evalScript, { requireModule } from '../lib/eval-script'
+import evalScript from '../lib/eval-script'
 
 const {
   __NEXT_DATA__: {
@@ -41,5 +41,3 @@ domready(() => {
   if (ids) rehydrate(ids)
   render(createElement(App, appProps), container)
 })
-
-module.exports = requireModule
diff --git a/examples/shared-modules/package.json b/examples/shared-modules/package.json
index a97acae5..8d7c733d 100644
--- a/examples/shared-modules/package.json
+++ b/examples/shared-modules/package.json
@@ -12,8 +12,5 @@
     "next": "*"
   },
   "author": "",
-  "license": "ISC",
-  "next": {
-    "cdn": true
-  }
+  "license": "ISC"
 }
diff --git a/gulpfile.js b/gulpfile.js
index 6818aaf9..9a5f1d48 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -71,69 +71,9 @@ gulp.task('copy-bench-fixtures', () => {
 })
 
 gulp.task('build', [
-  'build-dev-client',
-  'build-client',
   'build-prefetcher'
 ])
 
-gulp.task('build-dev-client', ['compile-lib', 'compile-client'], () => {
-  return gulp
-  .src('dist/client/next-dev.js')
-  .pipe(webpack({
-    quiet: true,
-    output: { filename: 'next-dev.bundle.js', libraryTarget: 'var', library: 'require' },
-    module: {
-      loaders: [
-        {
-          test: /eval-script\.js$/,
-          exclude: /node_modules/,
-          loader: 'babel',
-          query: {
-            plugins: [
-              'babel-plugin-transform-remove-strict-mode'
-            ]
-          }
-        }
-      ]
-    }
-  }))
-  .pipe(gulp.dest('dist/client'))
-  .pipe(notify('Built dev client'))
-})
-
-gulp.task('build-client', ['compile-lib', 'compile-client'], () => {
-  return gulp
-  .src('dist/client/next.js')
-  .pipe(webpack({
-    quiet: true,
-    output: { filename: 'next.bundle.js', libraryTarget: 'var', library: 'require' },
-    plugins: [
-      new webpack.webpack.DefinePlugin({
-        'process.env': {
-          NODE_ENV: JSON.stringify('production')
-        }
-      }),
-      new webpack.webpack.optimize.UglifyJsPlugin()
-    ],
-    module: {
-      loaders: [
-        {
-          test: /eval-script\.js$/,
-          exclude: /node_modules/,
-          loader: 'babel',
-          query: {
-            plugins: [
-              'babel-plugin-transform-remove-strict-mode'
-            ]
-          }
-        }
-      ]
-    }
-  }))
-  .pipe(gulp.dest('dist/client'))
-  .pipe(notify('Built release client'))
-})
-
 gulp.task('build-prefetcher', ['compile-lib', 'compile-client'], () => {
   return gulp
   .src('client/next-prefetcher.js')
@@ -172,7 +112,7 @@ gulp.task('build-prefetcher', ['compile-lib', 'compile-client'], () => {
   .pipe(notify('Built release prefetcher'))
 })
 
-gulp.task('test', () => {
+gulp.task('test', ['compile'], () => {
   return gulp.src('./test')
   .pipe(jest.default({
     coverage: true,
diff --git a/lib/eval-script.js b/lib/eval-script.js
index f77cb982..5fe282d3 100644
--- a/lib/eval-script.js
+++ b/lib/eval-script.js
@@ -1,32 +1,3 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import App from '../lib/app'
-import Link from '../lib/link'
-import * as Prefetch from '../lib/prefetch'
-import * as Css from '../lib/css'
-import Head from '../lib/head'
-
-const modules = new Map([
-  ['react', React],
-  ['react-dom', ReactDOM],
-  ['next/app', App],
-  ['next/link', Link],
-  ['next/prefetch', Prefetch],
-  ['next/css', Css],
-  ['next/head', Head]
-])
-
-function require (moduleName) {
-  const name = moduleName
-  const m = modules.get(name)
-
-  if (m) return m
-
-  throw new Error(`Module "${moduleName}" is not exists in the bundle`)
-}
-
-export const requireModule = require
-
 /**
  * IMPORTANT: This module is compiled *without* `use strict`
  * so that when we `eval` a dependency below, we don't enforce
@@ -41,6 +12,7 @@ export const requireModule = require
 
 export default function evalScript (script) {
   const module = { exports: {} }
+
   eval(script) // eslint-disable-line no-eval
   return module.exports
 }
diff --git a/package.json b/package.json
index 3832e30d..0ca875f2 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,6 @@
     "react": "15.4.1",
     "react-dom": "15.4.1",
     "react-hot-loader": "3.0.0-beta.6",
-    "read-pkg-up": "2.0.0",
     "send": "0.14.1",
     "source-map-support": "0.4.6",
     "strip-ansi": "3.0.1",
@@ -75,7 +74,6 @@
   },
   "devDependencies": {
     "babel-eslint": "7.1.1",
-    "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "babel-preset-env": "1.0.2",
     "benchmark": "2.1.2",
     "coveralls": "2.11.15",
diff --git a/server/build/webpack.js b/server/build/webpack.js
index a745b8ad..312535e7 100644
--- a/server/build/webpack.js
+++ b/server/build/webpack.js
@@ -18,7 +18,10 @@ export default async function createCompiler (dir, { dev = false } = {}) {
     ignore: 'pages/_document.js'
   })
 
-  const entry = {}
+  const entry = {
+    'main.js': dev ? require.resolve('../../client/next-dev') : require.resolve('../../client/next')
+  }
+
   const defaultEntries = dev
     ? [join(__dirname, '..', '..', 'client/webpack-hot-middleware-client')] : []
   for (const p of pages) {
@@ -145,6 +148,7 @@ export default async function createCompiler (dir, { dev = false } = {}) {
             alias: {
               'babel-runtime': babelRuntimePath,
               react: require.resolve('react'),
+              'react-dom': require.resolve('react-dom'),
               'next/link': require.resolve('../../lib/link'),
               'next/prefetch': require.resolve('../../lib/prefetch'),
               'next/css': require.resolve('../../lib/css'),
@@ -179,22 +183,6 @@ export default async function createCompiler (dir, { dev = false } = {}) {
         return `webpack:///${resourcePath}?${id}`
       }
     },
-    externals: [
-      'react',
-      'react-dom',
-      {
-        [require.resolve('react')]: 'react',
-        [require.resolve('../../lib/link')]: 'next/link',
-        [require.resolve('../../lib/prefetch')]: 'next/prefetch',
-        [require.resolve('../../lib/css')]: 'next/css',
-        [require.resolve('../../lib/head')]: 'next/head',
-        // React addons ask for React like this.
-        // That causes webpack to push react into the app's bundle.
-        // This fix simply prevents that and ask to use React from the next-bundle
-        './React': 'react',
-        './ReactDOM': 'react-dom'
-      }
-    ],
     resolve: {
       root: [
         nodeModulesDir,
diff --git a/server/config.js b/server/config.js
index 8b9ca8ed..15e72eb1 100644
--- a/server/config.js
+++ b/server/config.js
@@ -3,7 +3,7 @@ import { readFile } from 'mz/fs'
 
 const cache = new Map()
 
-const defaultConfig = { cdn: true }
+const defaultConfig = {}
 
 export default function getConfig (dir) {
   if (!cache.has(dir)) {
diff --git a/server/document.js b/server/document.js
index ddb6244a..90c8501c 100644
--- a/server/document.js
+++ b/server/document.js
@@ -1,12 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import htmlescape from 'htmlescape'
 import { renderStatic } from 'glamor/server'
-import readPkgUp from 'read-pkg-up'
-
-const { pkg } = readPkgUp.sync({
-  cwd: __dirname,
-  normalize: false
-})
 
 export default class Document extends Component {
   static getInitialProps ({ renderPage }) {
@@ -82,37 +76,11 @@ export class NextScript extends Component {
   }
 
   render () {
-    const { staticMarkup, dev, cdn } = this.context._documentProps
+    const { staticMarkup } = this.context._documentProps
+
     return <div>
-      {staticMarkup ? null : createClientScript({ dev, cdn })}
-      <script type='text/javascript' src='/_next/commons.js' />
+      { staticMarkup ? null : <script type='text/javascript' src='/_next/commons.js' /> }
+      { staticMarkup ? null : <script type='text/javascript' src='/_next/main.js' /> }
     </div>
   }
 }
-
-function createClientScript ({ dev, cdn }) {
-  if (dev) {
-    return <script type='text/javascript' src='/_next/next-dev.bundle.js' />
-  }
-
-  if (!cdn) {
-    return <script type='text/javascript' src='/_next/next.bundle.js' />
-  }
-
-  return <script dangerouslySetInnerHTML={{ __html: `
-    (function () {
-      load('https://cdn.zeit.co/next.js/${pkg.version}/next.min.js', function (err) {
-        if (err) load('/_next/next.bundle.js')
-      })
-      function load (src, fn) {
-        fn = fn || function () {}
-        var script = document.createElement('script')
-        script.src = src
-        script.onload = function () { fn(null) }
-        script.onerror = fn
-        script.crossorigin = 'anonymous'
-        document.body.appendChild(script)
-      }
-    })()
-  `}} />
-}
diff --git a/server/index.js b/server/index.js
index a7dfeb83..d1b3cf83 100644
--- a/server/index.js
+++ b/server/index.js
@@ -55,6 +55,11 @@ export default class Server {
       await this.serveStatic(req, res, p)
     })
 
+    this.router.get('/_next/main.js', async (req, res, params) => {
+      const p = join(this.dir, '.next/main.js')
+      await this.serveStatic(req, res, p)
+    })
+
     this.router.get('/_next/commons.js', async (req, res, params) => {
       const p = join(this.dir, '.next/commons.js')
       await this.serveStatic(req, res, p)
diff --git a/server/render.js b/server/render.js
index 4840a73c..8f99394f 100644
--- a/server/render.js
+++ b/server/render.js
@@ -3,7 +3,6 @@ import { createElement } from 'react'
 import { renderToString, renderToStaticMarkup } from 'react-dom/server'
 import requireModule from './require'
 import read from './read'
-import getConfig from './config'
 import Router from '../lib/router'
 import Head, { defaultHead } from '../lib/head'
 import App from '../lib/app'
@@ -67,8 +66,6 @@ async function doRender (req, res, pathname, query, {
     return { html, head }
   }
 
-  const config = await getConfig(dir)
-
   const docProps = await Document.getInitialProps({ ...ctx, renderPage })
 
   const doc = createElement(Document, {
@@ -82,7 +79,6 @@ async function doRender (req, res, pathname, query, {
     },
     dev,
     staticMarkup,
-    cdn: config.cdn,
     ...docProps
   })
 
diff --git a/test/integration.test.js b/test/integration.test.js
index 46f72787..15960088 100644
--- a/test/integration.test.js
+++ b/test/integration.test.js
@@ -3,7 +3,7 @@
 'use strict'
 
 import { join } from 'path'
-import next from '../server/next'
+import next from '../dist/server/next'
 
 const dir = join(__dirname, 'fixtures', 'basic')
 const app = next({