diff --git a/examples/developer-guide/adding_view_engines/app.js b/examples/developer-guide/adding_view_engines/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/adding_view_engines/app.js
+++ b/examples/developer-guide/adding_view_engines/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/binding_events/app.js b/examples/developer-guide/binding_events/app.js
index bc3c46b83..b049d318c 100644
--- a/examples/developer-guide/binding_events/app.js
+++ b/examples/developer-guide/binding_events/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/binding_events/application.json b/examples/developer-guide/binding_events/application.json
index c9a2735f0..9b67b0c09 100644
--- a/examples/developer-guide/binding_events/application.json
+++ b/examples/developer-guide/binding_events/application.json
@@ -5,7 +5,6 @@
             "cache": false,
             "forceUpdate": true
         },
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit",
@@ -18,5 +17,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js b/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js
index ccd553a4e..ecc538061 100644
--- a/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js
+++ b/examples/developer-guide/binding_events/middleware/mojito-contextualizer.js
@@ -1,4 +1,4 @@
-module.exports = function(config) {
+module.exports = function() {
     var url = require('url'),
         query;
     return function(req, res, next) {
diff --git a/examples/developer-guide/configure_routing/app.js b/examples/developer-guide/configure_routing/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/configure_routing/app.js
+++ b/examples/developer-guide/configure_routing/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/02_mojits/app.js b/examples/developer-guide/dashboard/02_mojits/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/02_mojits/app.js
+++ b/examples/developer-guide/dashboard/02_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/03_frame_mojits/app.js b/examples/developer-guide/dashboard/03_frame_mojits/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/03_frame_mojits/app.js
+++ b/examples/developer-guide/dashboard/03_frame_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/04_composite_mojits/app.js b/examples/developer-guide/dashboard/04_composite_mojits/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/04_composite_mojits/app.js
+++ b/examples/developer-guide/dashboard/04_composite_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/05_getting_data/app.js b/examples/developer-guide/dashboard/05_getting_data/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/05_getting_data/app.js
+++ b/examples/developer-guide/dashboard/05_getting_data/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/06_testing/app.js b/examples/developer-guide/dashboard/06_testing/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/06_testing/app.js
+++ b/examples/developer-guide/dashboard/06_testing/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/07_binders/app.js b/examples/developer-guide/dashboard/07_binders/app.js
index 23370c701..2be07f1ee 100644
--- a/examples/developer-guide/dashboard/07_binders/app.js
+++ b/examples/developer-guide/dashboard/07_binders/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/dashboard/trib/app.js b/examples/developer-guide/dashboard/trib/app.js
index 2e3468f90..865edda6c 100644
--- a/examples/developer-guide/dashboard/trib/app.js
+++ b/examples/developer-guide/dashboard/trib/app.js
@@ -12,12 +12,14 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 
 app.get('/', function (req, res, next) {
diff --git a/examples/developer-guide/dashboard/trib/application.json b/examples/developer-guide/dashboard/trib/application.json
index 078f2a925..ab296265a 100644
--- a/examples/developer-guide/dashboard/trib/application.json
+++ b/examples/developer-guide/dashboard/trib/application.json
@@ -2,7 +2,6 @@
     {
         "settings": [ "master" ],
         "appPort": "8666",
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "staticHandling": {
           "appName": "trib"
         },
diff --git a/examples/developer-guide/dashboard/trib/application.yaml b/examples/developer-guide/dashboard/trib/application.yaml
index 3d9af52db..618c45b72 100644
--- a/examples/developer-guide/dashboard/trib/application.yaml
+++ b/examples/developer-guide/dashboard/trib/application.yaml
@@ -2,8 +2,6 @@
 - settings:
   - master
   appPort: '8666'
-  middleware: 
-  - middleware/mojito-contextualizer.js
   staticHandling:
     appName: trib
   yui:
diff --git a/examples/developer-guide/device_assets/app.js b/examples/developer-guide/device_assets/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/device_assets/app.js
+++ b/examples/developer-guide/device_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/device_views/app.js b/examples/developer-guide/device_views/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/device_views/app.js
+++ b/examples/developer-guide/device_views/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/framed_assets/app.js b/examples/developer-guide/framed_assets/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/framed_assets/app.js
+++ b/examples/developer-guide/framed_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/framed_config/app.js b/examples/developer-guide/framed_config/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/framed_config/app.js
+++ b/examples/developer-guide/framed_config/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/generating_urls/app.js b/examples/developer-guide/generating_urls/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/generating_urls/app.js
+++ b/examples/developer-guide/generating_urls/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/global_assets/app.js b/examples/developer-guide/global_assets/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/global_assets/app.js
+++ b/examples/developer-guide/global_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/hello/app.js b/examples/developer-guide/hello/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/hello/app.js
+++ b/examples/developer-guide/hello/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/htmlframe_mojit/app.js b/examples/developer-guide/htmlframe_mojit/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/htmlframe_mojit/app.js
+++ b/examples/developer-guide/htmlframe_mojit/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/inter-mojit/app.js b/examples/developer-guide/inter-mojit/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/inter-mojit/app.js
+++ b/examples/developer-guide/inter-mojit/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/locale_i18n/app.js b/examples/developer-guide/locale_i18n/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/locale_i18n/app.js
+++ b/examples/developer-guide/locale_i18n/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/model_yql/app.js b/examples/developer-guide/model_yql/app.js
index bc3c46b83..b049d318c 100644
--- a/examples/developer-guide/model_yql/app.js
+++ b/examples/developer-guide/model_yql/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/model_yql/application.json b/examples/developer-guide/model_yql/application.json
index 6a3273d0f..754eedf60 100644
--- a/examples/developer-guide/model_yql/application.json
+++ b/examples/developer-guide/model_yql/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "middleware": ["middleware/mojito-contextualizer.js"],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit", 
@@ -21,5 +20,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/multiple_mojits/app.js b/examples/developer-guide/multiple_mojits/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/multiple_mojits/app.js
+++ b/examples/developer-guide/multiple_mojits/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/scroll_views/app.js b/examples/developer-guide/scroll_views/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/scroll_views/app.js
+++ b/examples/developer-guide/scroll_views/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/simple_assets/app.js b/examples/developer-guide/simple_assets/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/simple_assets/app.js
+++ b/examples/developer-guide/simple_assets/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/simple_config/app.js b/examples/developer-guide/simple_config/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/simple_config/app.js
+++ b/examples/developer-guide/simple_config/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/simple_logging/app.js b/examples/developer-guide/simple_logging/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/simple_logging/app.js
+++ b/examples/developer-guide/simple_logging/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/simple_view/app.js b/examples/developer-guide/simple_view/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/simple_view/app.js
+++ b/examples/developer-guide/simple_view/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/unittest_model_controller/app.js b/examples/developer-guide/unittest_model_controller/app.js
index bc3c46b83..b049d318c 100644
--- a/examples/developer-guide/unittest_model_controller/app.js
+++ b/examples/developer-guide/unittest_model_controller/app.js
@@ -12,15 +12,16 @@
 var debug = require('debug')('app'),
     express = require('express'),
     libmojito = require('../../../'),
+    customContextualizerMiddleware = require('./middleware/mojito-contextualizer.js'),
     app;
 
 app = express();
 app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
+app.use(customContextualizerMiddleware());
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/unittest_model_controller/application.json b/examples/developer-guide/unittest_model_controller/application.json
index 5da815367..754eedf60 100644
--- a/examples/developer-guide/unittest_model_controller/application.json
+++ b/examples/developer-guide/unittest_model_controller/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-        "middleware": [ "middleware/mojito-contextualizer.js" ],
         "specs": {
             "frame": {
                 "type": "HTMLFrameMojit", 
@@ -21,5 +20,8 @@
             }
         }
     },
-    { "settings": [ "environment:development" ], "selector": "mocked" }
+    {
+        "settings": [ "environment:development" ],
+        "selector": "mocked"
+    }
 ]
diff --git a/examples/developer-guide/using_configs/app.js b/examples/developer-guide/using_configs/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/using_configs/app.js
+++ b/examples/developer-guide/using_configs/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/using_cookies/app.js b/examples/developer-guide/using_cookies/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/using_cookies/app.js
+++ b/examples/developer-guide/using_cookies/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/using_parameters/app.js b/examples/developer-guide/using_parameters/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/using_parameters/app.js
+++ b/examples/developer-guide/using_parameters/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/developer-guide/yui_module/app.js b/examples/developer-guide/yui_module/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/developer-guide/yui_module/app.js
+++ b/examples/developer-guide/yui_module/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/input/cookies/app.js b/examples/input/cookies/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/input/cookies/app.js
+++ b/examples/input/cookies/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/input/get/app.js b/examples/input/get/app.js
index f49d26b0e..d0438e24c 100644
--- a/examples/input/get/app.js
+++ b/examples/input/get/app.js
@@ -20,8 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
-
 
 // Example usage on how to execute anonymous mojit. 
 app.get('/:mojitType/:mojitAction', function (req, res, next) {
diff --git a/examples/input/merged/app.js b/examples/input/merged/app.js
index ae62fd322..bd1b8eee2 100644
--- a/examples/input/merged/app.js
+++ b/examples/input/merged/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // "root": {
 //     "verbs": ["post"],
diff --git a/examples/input/post/app.js b/examples/input/post/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/input/post/app.js
+++ b/examples/input/post/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/input/route/app.js b/examples/input/route/app.js
index f9f59da03..751f1c825 100644
--- a/examples/input/route/app.js
+++ b/examples/input/route/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // This shows an example how to setup route params for specific paths
 // Previously, this was done via `routes.json` using the `params` property.
diff --git a/examples/newsboxes/app.js b/examples/newsboxes/app.js
index d2cf8d4d5..7f7b519bb 100644
--- a/examples/newsboxes/app.js
+++ b/examples/newsboxes/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/quickstartguide/app.js b/examples/quickstartguide/app.js
index d23ea7b3f..3f313087e 100644
--- a/examples/quickstartguide/app.js
+++ b/examples/quickstartguide/app.js
@@ -19,7 +19,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // regex paths should be defined in `app.js`. 
 app.get(/\/|index.html/, libmojito.dispatch('shelf.index'));
diff --git a/examples/simple/part1/app.js b/examples/simple/part1/app.js
index a52ac295b..cd3638a52 100644
--- a/examples/simple/part1/app.js
+++ b/examples/simple/part1/app.js
@@ -21,7 +21,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part2/app.js b/examples/simple/part2/app.js
index d9cbf0dc8..29bde2d77 100644
--- a/examples/simple/part2/app.js
+++ b/examples/simple/part2/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part3/app.js b/examples/simple/part3/app.js
index d9cbf0dc8..29bde2d77 100644
--- a/examples/simple/part3/app.js
+++ b/examples/simple/part3/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part4/app.js b/examples/simple/part4/app.js
index d9cbf0dc8..29bde2d77 100644
--- a/examples/simple/part4/app.js
+++ b/examples/simple/part4/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part5/app.js b/examples/simple/part5/app.js
index d9cbf0dc8..29bde2d77 100644
--- a/examples/simple/part5/app.js
+++ b/examples/simple/part5/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part6/app.js b/examples/simple/part6/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/simple/part6/app.js
+++ b/examples/simple/part6/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/examples/simple/part7/app.js b/examples/simple/part7/app.js
index d9cbf0dc8..29bde2d77 100644
--- a/examples/simple/part7/app.js
+++ b/examples/simple/part7/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:type/:action', function (req, res, next) {
     libmojito.dispatch(req.params.type + '.' + req.params.action)(req, res, next);
diff --git a/examples/simple/part8/app.js b/examples/simple/part8/app.js
index bc3c46b83..a694d175c 100644
--- a/examples/simple/part8/app.js
+++ b/examples/simple/part8/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/lib/app/middleware/mojito-contextualizer.js b/lib/app/middleware/mojito-contextualizer.js
index a715f63f4..fa01f858d 100644
--- a/lib/app/middleware/mojito-contextualizer.js
+++ b/lib/app/middleware/mojito-contextualizer.js
@@ -131,7 +131,7 @@ function RequestContextualizer() {
 
     var defaultLang;
 
-    return function (req, res, next) {
+    return function middlewareMojitoContextualizer(req, res, next) {
 
 
         if (!defaultLang && req.app && req.app.mojito) {
diff --git a/lib/app/middleware/mojito-handler-error.js b/lib/app/middleware/mojito-handler-error.js
index 31f0b591e..dd43ab6b6 100644
--- a/lib/app/middleware/mojito-handler-error.js
+++ b/lib/app/middleware/mojito-handler-error.js
@@ -11,11 +11,10 @@
 /**
 Export a middleware error handler.
 
-@param {Object} The configuration.
 @return {Object} The handler.
 **/
-module.exports = function (config) {
-    return function (err, req, res, next) {
+module.exports = function () {
+    return function middlewareMojitoHandlerError(err, req, res, next) {
         var statusCode = res.statusCode || 500;
         res.send(statusCode, {
             code: statusCode,
diff --git a/lib/app/middleware/mojito-handler-static.js b/lib/app/middleware/mojito-handler-static.js
index db5995396..f051f9531 100644
--- a/lib/app/middleware/mojito-handler-static.js
+++ b/lib/app/middleware/mojito-handler-static.js
@@ -204,7 +204,7 @@ function staticProvider() {
         }
     }
 
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerStatic(req, res, next) {
 
         if (req.method !== 'GET' && req.method !== 'HEAD') {
             next();
@@ -416,9 +416,7 @@ Export function to create the static handler.
     until invalidated by a conditional GET request.
 @return {Function} express middleware
 **/
-module.exports = function (options) {
-    return staticProvider(options);
-};
+module.exports = staticProvider;
 
 
 // These will let us unit test
diff --git a/lib/app/middleware/mojito-handler-tunnel-parser.js b/lib/app/middleware/mojito-handler-tunnel-parser.js
index 2bc935794..afc24d242 100644
--- a/lib/app/middleware/mojito-handler-tunnel-parser.js
+++ b/lib/app/middleware/mojito-handler-tunnel-parser.js
@@ -29,7 +29,7 @@ module.exports = function () {
         staticPrefix,
         tunnelPrefix;
 
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerTunnelParser(req, res, next) {
 
         if (!appConfig && req.app && req.app.mojito) {
             app = req.app;
diff --git a/lib/app/middleware/mojito-handler-tunnel-rpc.js b/lib/app/middleware/mojito-handler-tunnel-rpc.js
index 626aed058..bb5e0b7b6 100644
--- a/lib/app/middleware/mojito-handler-tunnel-rpc.js
+++ b/lib/app/middleware/mojito-handler-tunnel-rpc.js
@@ -12,13 +12,15 @@
 
 'use strict';
 
+var debug = require('debug')('mojito:middleware:tunnel-rpc'),
+    dispatcher = require('../../dispatcher');
 /**
  * Exports a middleware factory that can handle RPC tunnel requests.
  *
  * @return {Function} The handler.
  */
 module.exports = function () {
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerTunnelRPC(req, res, next) {
         var rpcReq = req._tunnel && req._tunnel.rpcReq,
             command,
             store;
@@ -66,7 +68,8 @@ module.exports = function () {
                     context: command.context
                 };
 
-                return next();
+                debug('dispatching rpc tunnel request');
+                dispatcher.handleRequest(req, res, next);
             }
         );
     };
diff --git a/lib/app/middleware/mojito-handler-tunnel-specs.js b/lib/app/middleware/mojito-handler-tunnel-specs.js
index 8560d24c1..f146f8087 100644
--- a/lib/app/middleware/mojito-handler-tunnel-specs.js
+++ b/lib/app/middleware/mojito-handler-tunnel-specs.js
@@ -18,7 +18,7 @@
  * @return {Function} The handler.
  */
 module.exports = function () {
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerTunnelSpecs(req, res, next) {
         var specsReq = req._tunnel && req._tunnel.specsReq,
             instance,
             type,
diff --git a/lib/app/middleware/mojito-handler-tunnel-type.js b/lib/app/middleware/mojito-handler-tunnel-type.js
index ce1f52a19..d7f4c593e 100644
--- a/lib/app/middleware/mojito-handler-tunnel-type.js
+++ b/lib/app/middleware/mojito-handler-tunnel-type.js
@@ -19,7 +19,7 @@
  * @return {Function} The handler.
  */
 module.exports = function () {
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerTunnelType(req, res, next) {
         var typeReq = req._tunnel && req._tunnel.typeReq,
             instance,
             store;
diff --git a/lib/app/middleware/mojito-handler-tunnel.js b/lib/app/middleware/mojito-handler-tunnel.js
index 843d8dcf2..86b58d654 100644
--- a/lib/app/middleware/mojito-handler-tunnel.js
+++ b/lib/app/middleware/mojito-handler-tunnel.js
@@ -28,7 +28,7 @@ module.exports = function () {
         specsMW  = specs(),
         typeMW   = type();
 
-    return function (req, res, next) {
+    return function middlewareMojitoHandlerTunnel(req, res, next) {
         var middleware = [
             parserMW,
             rpcMW,
diff --git a/lib/mojito.js b/lib/mojito.js
index e39e0ecc7..e27e7852e 100644
--- a/lib/mojito.js
+++ b/lib/mojito.js
@@ -37,7 +37,6 @@ var debug = require('debug')('mojito'),
     libmiddleware = require('./middleware'),
     librouter = require('./router'),
     libstore = require('./store'),
-    libtunnel = require('./tunnel'),
     libextend = require('./util').extend,
     Mojito;
 
@@ -65,7 +64,7 @@ Mojito extension for Express.
 @param {express.application} app `express` application instance
 @param {Object} options server options
     @param {Object} options.context
-@uses *express, dispatcher, logger, middleware, router, store, tunnel
+@uses *express, dispatcher, logger, middleware, router, store
 **/
 function Mojito(app, options) {
 
@@ -243,7 +242,6 @@ Mojito.prototype._configureAppInstance = function (app, store, options, appConfi
 module.exports = {
     extend: extend,
     middleware: libmiddleware.middleware,
-    tunnelMiddleware: libtunnel.tunnelMiddleware,
     dispatch: libdispatcher.dispatch,
     dispatcher: libdispatcher.dispatch // alias for `dispatch`
 };
diff --git a/lib/tunnel.js b/lib/tunnel.js
deleted file mode 100644
index 6b7f29814..000000000
--- a/lib/tunnel.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2011-2013, Yahoo! Inc.  All rights reserved.
- * Copyrights licensed under the New BSD License.
- * See the accompanying LICENSE file for terms.
- */
-
-/*jslint nomen:true, node:true*/
-
-/**
-Submodule used by mojito to configure tunnel middleware.
-
-Usage:
-
-    app.post('/tunnel', mojito.tunnelMiddleware());
-
-Typically, applications will do this in their `app.js`. 
-
-This is a **required** step in order for Mojito to accept tunnel requests
-from the client runtime.
-
-@module mojito
-@submodule tunnelMiddleware
-**/
-
-'use strict';
-
-var debug = require('debug')('mojito:tunnel'),
-    dispatcher = require('./dispatcher');
-
-/**
- * Simply returns the dispatcher handler to process tunnel requests.
- */
-function registerTunnelRpc() {
-    debug('installing tunnel handler');
-    return dispatcher.handleRequest;
-}
-
-module.exports = {
-    tunnelMiddleware: registerTunnelRpc
-};
diff --git a/tests/fixtures/badfiles/app.js b/tests/fixtures/badfiles/app.js
index 70cacea67..8d5741a71 100644
--- a/tests/fixtures/badfiles/app.js
+++ b/tests/fixtures/badfiles/app.js
@@ -15,7 +15,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/fixtures/gsg5-appConfig/app.js b/tests/fixtures/gsg5-appConfig/app.js
index 0f55f1450..eac62db4c 100644
--- a/tests/fixtures/gsg5-appConfig/app.js
+++ b/tests/fixtures/gsg5-appConfig/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/fixtures/gsg5/app.js b/tests/fixtures/gsg5/app.js
index ddde7c77e..e846c465f 100644
--- a/tests/fixtures/gsg5/app.js
+++ b/tests/fixtures/gsg5/app.js
@@ -15,7 +15,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/fixtures/store/app.js b/tests/fixtures/store/app.js
index 0f55f1450..eac62db4c 100644
--- a/tests/fixtures/store/app.js
+++ b/tests/fixtures/store/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/func/applications/frameworkapp/common/app.js b/tests/func/applications/frameworkapp/common/app.js
index 1754b12e4..177e6d582 100644
--- a/tests/func/applications/frameworkapp/common/app.js
+++ b/tests/func/applications/frameworkapp/common/app.js
@@ -20,9 +20,7 @@ app.set('port', process.env.PORT || 8666);
 libmojito.extend(app);
 
 app.use(libmojito.middleware());
-
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // "routeparamssimple": {
 //     "verbs": ["get"],
diff --git a/tests/func/applications/frameworkapp/configapp/app.js b/tests/func/applications/frameworkapp/configapp/app.js
index c66ff44aa..490125480 100644
--- a/tests/func/applications/frameworkapp/configapp/app.js
+++ b/tests/func/applications/frameworkapp/configapp/app.js
@@ -21,7 +21,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 dispatcherMiddleware = libmojito.dispatch('{type}.{action}');
 app.get('/:type/:action', dispatcherMiddleware);
diff --git a/tests/func/applications/frameworkapp/routing/app.js b/tests/func/applications/frameworkapp/routing/app.js
index b605dc2e1..f6c60be93 100644
--- a/tests/func/applications/frameworkapp/routing/app.js
+++ b/tests/func/applications/frameworkapp/routing/app.js
@@ -21,8 +21,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
-
 
 // "_any_mojit_particular_action": {
 //     "verbs": ["get"],
diff --git a/tests/func/applications/frameworkapp/serveronly/app.js b/tests/func/applications/frameworkapp/serveronly/app.js
index 9acc90ae9..0778092dd 100644
--- a/tests/func/applications/frameworkapp/serveronly/app.js
+++ b/tests/func/applications/frameworkapp/serveronly/app.js
@@ -21,7 +21,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // "default": {
 //     "verbs": ["get", "post", "put", "head", "delete"],
diff --git a/tests/func/applications/frameworkapp/usecase/app.js b/tests/func/applications/frameworkapp/usecase/app.js
index 4a3918890..e0224fe0f 100644
--- a/tests/func/applications/frameworkapp/usecase/app.js
+++ b/tests/func/applications/frameworkapp/usecase/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 // flickr5
 app.get('/flickr5', function (req, res, next) {
diff --git a/tests/func/applications/frameworkapp/yaml-config/app.js b/tests/func/applications/frameworkapp/yaml-config/app.js
index a274733c8..6e14d9551 100644
--- a/tests/func/applications/frameworkapp/yaml-config/app.js
+++ b/tests/func/applications/frameworkapp/yaml-config/app.js
@@ -20,7 +20,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/func/applications/performanceapp/part1/app.js b/tests/func/applications/performanceapp/part1/app.js
index 90a2f2d17..57afcb525 100644
--- a/tests/func/applications/performanceapp/part1/app.js
+++ b/tests/func/applications/performanceapp/part1/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/func/applications/performanceapp/part2/app.js b/tests/func/applications/performanceapp/part2/app.js
index 178a1aeaa..94fcdeef8 100644
--- a/tests/func/applications/performanceapp/part2/app.js
+++ b/tests/func/applications/performanceapp/part2/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/@myMojit/index', libmojito.dispatch('@myMojit.index'));
 
diff --git a/tests/func/applications/performanceapp/part3/app.js b/tests/func/applications/performanceapp/part3/app.js
index b6c6763d0..d9ae664c0 100644
--- a/tests/func/applications/performanceapp/part3/app.js
+++ b/tests/func/applications/performanceapp/part3/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:base/:action', libmojito.dispatch('{base}.{action}'));
 
diff --git a/tests/func/applications/performanceapp/part4/app.js b/tests/func/applications/performanceapp/part4/app.js
index b6c6763d0..d9ae664c0 100644
--- a/tests/func/applications/performanceapp/part4/app.js
+++ b/tests/func/applications/performanceapp/part4/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:base/:action', libmojito.dispatch('{base}.{action}'));
 
diff --git a/tests/func/applications/performanceapp/part5/app.js b/tests/func/applications/performanceapp/part5/app.js
index b6c6763d0..d9ae664c0 100644
--- a/tests/func/applications/performanceapp/part5/app.js
+++ b/tests/func/applications/performanceapp/part5/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/:base/:action', libmojito.dispatch('{base}.{action}'));
 
diff --git a/tests/func/applications/performanceapp/part6/app.js b/tests/func/applications/performanceapp/part6/app.js
index 4c0fd3d2c..90e79aaf3 100644
--- a/tests/func/applications/performanceapp/part6/app.js
+++ b/tests/func/applications/performanceapp/part6/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');
diff --git a/tests/func/applications/performanceapp/part7/app.js b/tests/func/applications/performanceapp/part7/app.js
index 4c0fd3d2c..90e79aaf3 100644
--- a/tests/func/applications/performanceapp/part7/app.js
+++ b/tests/func/applications/performanceapp/part7/app.js
@@ -14,7 +14,6 @@ libmojito.extend(app);
 
 app.use(libmojito.middleware());
 app.mojito.attachRoutes();
-app.post('/tunnel', libmojito.tunnelMiddleware());
 
 app.get('/status', function (req, res) {
     res.send('200 OK');