diff --git a/build.json b/build.json
index e2e2a7e..c1aa054 100644
--- a/build.json
+++ b/build.json
@@ -1,7 +1,6 @@
 [
   "build/boot.js",
   "../WeakMap/weakmap.js",
-  "../observe-js/src/observe.js",
   "build/if-poly.js",
   "../ShadowDOM/build.json",
   "src/patches-shadowdom-polyfill.js",
@@ -9,24 +8,12 @@
   "build/else.js",
   "src/patches-shadowdom-native.js",
   "build/end-if.js",
-
   "../URL/url.js",
   "src/lang.js",
   "src/dom.js",
-  "src/template.js",
-  "src/inspector.js",
-  "src/unresolved.js",
-  "src/module.js",
-  "src/microtask.js",
-  "src/url.js",
-
   "../HTMLImports/build.json",
   "../CustomElements/build.json",
   "src/patches-custom-elements.js",
-  "src/loader.js",
-  "src/styleloader.js",
-
-  "../TemplateBinding/build.json",
-
-  "src/patches-mdv.js"
+  "src/unresolved.js",
+  "src/module.js"
 ]
diff --git a/gruntfile.js b/gruntfile.js
index 91ba8d4..7e90ffd 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -61,14 +61,6 @@ module.exports = function(grunt) {
         files: {
           'build/platform.js': 'build/platform.concat.js'
         }
-      },
-      nativeOnly: {
-        options: {
-          banner: grunt.file.read('banner.txt') + '//@version <%= buildversion %>\n'
-        },
-        files: {
-          'build/platform.native.js': readManifest('build-native.json')
-        }
       }
     },
     audit: {
@@ -77,11 +69,7 @@ module.exports = function(grunt) {
           repos: [
             '../CustomElements',
             '../HTMLImports',
-            '../NodeBind',
             '../ShadowDOM',
-            '../TemplateBinding',
-            '../WeakMap',
-            '../observe-js',
             '../platform-dev'
           ]
         },
@@ -137,7 +125,6 @@ module.exports = function(grunt) {
   grunt.registerTask('test-build-cr', ['minify', 'stash', 'karma:buildbot', 'restore']);
   grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot', 'test-build-cr']);
   grunt.registerTask('build-lite', ['concat:lite']);
-  grunt.registerTask('build-native', ['version', 'uglify:nativeOnly']);
   grunt.registerTask('release', function() {
     grunt.option('release', true);
     grunt.task.run('minify');
diff --git a/platform.js b/platform.js
index 9c4fa01..8b375ed 100644
--- a/platform.js
+++ b/platform.js
@@ -51,25 +51,13 @@ function processFlags(flags) {
         '../URL/url.js',
         'src/lang.js',
         'src/dom.js',
-        'src/template.js',
-        'src/inspector.js',
-        'src/unresolved.js',
-        'src/module.js',
-        'src/microtask.js',
-        'src/url.js',
-
         '../HTMLImports/html-imports.js',
         '../CustomElements/custom-elements.js',
         'src/patches-custom-elements.js',
-        'src/loader.js',
-        'src/styleloader.js',
-
-        // TODO(sjmiles): polymer-expressions.js does not load dependencies, but
-        // the build.json does
-        '../observe-js/src/observe.js',
-        '../NodeBind/src/NodeBind.js',
-        '../TemplateBinding/src/TemplateBinding.js',
-        'src/patches-mdv.js'
+
+        // these scripts are loaded in platform.js due to polyfill timing issues
+        'src/unresolved.js',
+        'src/module.js'
       ]
     );
 
@@ -77,6 +65,8 @@ function processFlags(flags) {
 
 }
 
+//CustomElements = {useNative: true};
+
 // export
 
 window[scopeName] = {