diff --git a/run.js b/run.js
index c412e31c1056d6c27c20c8ee0844725e3f44db4f..ba98309048936a26e8ad6bc1fb2f9b8b21af7516 100644
--- a/run.js
+++ b/run.js
@@ -58,73 +58,6 @@ function createServer(port) {
     // unknown site?  really?
     if (!siteroot) return fourOhFour(response, "No site on this port");
 
-    // hook to fetch manifests for HTML5 repos
-    var parsedURI = url.parse(request.url, true);
-    if (parsedURI.pathname == '/getmanifest') {
-      var makeRequest = function (getURI) {
-        getURI = url.parse(getURI);
-        getURI.pathname = getURI.pathname || '/';
-        getURI.search = getURI.search || '';
-        getURI.port = getURI.port || '80';
-        var client = http.createClient(parseInt(getURI.port), getURI.hostname);
-        var siteRequest = client.request('GET',
-                                         getURI.pathname + getURI.search,
-                                         {host: getURI.host});
-        siteRequest.on('response', function (siteResponse) {
-          if (parsedURI.query.follow
-              && siteResponse.statusCode > 300
-              && siteResponse.statusCode < 400) {
-            getURI = siteResponse.headers['location'];
-            sys.puts('Proxy redirect to: ' + getURI);
-            makeRequest(getURI);
-            return;
-          }
-          response.writeHead(
-            siteResponse.statusCode, siteResponse.headers);
-          siteResponse.on('data', function (chunk) {
-            response.write(chunk, 'binary');
-          });
-          siteResponse.on('end', function () {
-            response.end();
-          });
-        });
-        siteRequest.addListener('error', function(socketException){
-          if (socketException.errno === process.ECONNREFUSED) {
-            sys.log('ECONNREFUSED: connection refused to '
-                    +request.socket.host
-                    +':'
-                    +request.socket.port);
-          } else {
-            sys.log(socketException);
-          }
-          fourOhFour(response);
-        });
-        siteRequest.end();
-      };
-      makeRequest(parsedURI.query.url);
-      sys.puts("Proxy URL " + parsedURI.query.url);
-      return;
-    }
-
-    // servers.js is an artificial file which defines a data structure
-    // where all of our servers are defined.  Ephemeral ports are used
-    // to give us a better shot of just working as lots of test directories
-    // are added, and this mechanism gives HTML based testing a means of
-    // mapping test names (just dir names) into urls
-    if (parsedURI.pathname == '/servers.js') {
-      var serverToUrlMap = {};
-      for (var i = 0; i < boundServers.length; i++) {
-        var o = boundServers[i]
-        var a = o.server.address();
-        serverToUrlMap[o.name] = "http://" + a.address + ":" + a.port;
-      }
-      var t = "var SERVERS = " + JSON.stringify(serverToUrlMap) + ";";
-      response.writeHead(200, {"Content-Type": "application/x-javascript"});
-      response.write(t);
-      response.end();
-      return;
-    }
-
     var serveFile = function (filename) {
       path.exists(filename, function(exists) {
         if(!exists) {