diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
index a5a01620..be05d495 100644
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -166,27 +166,6 @@ var CartodbWindshaft = function(serverOptions) {
      * END Routing
      ******************************************************************************************************************/
 
-    /**
-     * Helper to allow access to the layer to be used in the maps infowindow popup.
-     */
-    ws.get(serverOptions.base_url + '/infowindow', function(req, res){
-        ws.doCORS(res);
-        Step(
-            function(){
-                serverOptions.getInfowindow(req, this);
-            },
-            function(err, data){
-                if (err){
-                    ws.sendError(res, {error: err.message}, 500, 'GET INFOWINDOW', err);
-                    //ws.sendResponse(res, [{error: err.message}, 500]);
-                } else {
-                    ws.sendResponse(res, [{infowindow: data}, 200]);
-                }
-            }
-        );
-    });
-
-
     /**
      * Helper to allow access to metadata to be used in embedded maps.
      */
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 59e9fc3f..8b051fc0 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -766,33 +766,6 @@ module.exports = function(redisPool) {
         );
     };
 
-    /**
-     * Little helper method to get the current list of infowindow variables and return to client
-     * @param req
-     * @param callback
-     */
-    me.getInfowindow = function(req, callback){
-        var that = this;
-        var user = me.userByReq(req);
-
-        Step(
-            function(){
-                // TODO: if this step really needed ?
-                that.req2params(req, this);
-            },
-            function getDatabase(err){
-                if (err) throw err;
-                cartoData.getUserDBName(user, this);
-            },
-            function getInfowindow(err, dbname){
-                if (err) throw err;
-                cartoData.getTableInfowindow(dbname, req.params.table, this);
-            },
-            function(err, data){
-                callback(err, data);
-            }
-        );
-    };
 
     /**
      * Little helper method to get map metadata and return to client
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index a2e2324e..bf3514bb 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -490,89 +490,6 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
         });
     });
 
-    /////////////////////////////////////////////////////////////////////////////////
-    //
-    // GET INFOWINDOW
-    //
-    /////////////////////////////////////////////////////////////////////////////////
-    
-    test("get'ing blank infowindow returns blank", function(done){
-        assert.response(server, {
-            headers: {host: 'localhost'},
-            url: '/tiles/my_tablez/infowindow',
-            method: 'GET'
-        },{
-            status: 200,
-            headers: { 'X-Cache-Channel': test_database+':my_tablez' },
-            body: '{"infowindow":null}'
-        }, function() { done(); });
-    });
-    
-    test("get'ing blank infowindow with callback returns blank with callback", function(done){
-        assert.response(server, {
-            headers: {host: 'localhost'},
-            url: '/tiles/my_tablez/infowindow?callback=simon',
-            method: 'GET'
-        },{
-            status: 200,
-            body: 'simon({"infowindow":null});'
-        }, function() { done(); });
-    });
-    
-    
-    test("get'ing completed infowindow with callback returns information with callback", function(done){
-        assert.response(server, {
-            headers: {host: 'localhost'},
-            url: '/tiles/my_table/infowindow?callback=simon',
-            method: 'GET'
-        },{
-            status: 200,
-            body: 'simon({"infowindow":"this, that, the other"});'
-        }, function() { done(); });
-    });
-
-    test("get'ing infowindow of private table should fail when unauthenticated",
-    function(done) {
-        assert.response(server, {
-            headers: {host: 'localhost'},
-            url: '/tiles/test_table_private_1/infowindow',
-            method: 'GET'
-        },{}, function(res) {
-          // FIXME: should be 403 Forbidden
-          assert.equal(res.statusCode, 500, res.statusCode + ': ' + res.body);
-          done();
-        });
-    });
-
-    // See http://github.com/Vizzuality/Windshaft-cartodb/issues/55
-    test("get'ing infowindow of private table should fail on unknown username",
-    function(done) {
-        assert.response(server, {
-            headers: {host: 'unknown_user'},
-            url: '/tiles/test_table_private_1/infowindow',
-            method: 'GET'
-        },{
-        }, function(res) {
-          // FIXME: should be 403 Forbidden
-          assert.equal(res.statusCode, 500, res.statusCode + ': ' + res.body);
-          assert.deepEqual(JSON.parse(res.body),
-            {error:"missing unknown_user's database_name in redis (try CARTODB/script/restore_redis)"});
-          done();
-        });
-    });
-
-    test("get'ing infowindow of private table should succeed when authenticated",
-    function(done) {
-        assert.response(server, {
-            headers: {host: 'localhost'},
-            url: '/tiles/test_table_private_1/infowindow?map_key=1234',
-            method: 'GET'
-        },{}, function(res) {
-          assert.equal(res.statusCode, 200, res.body);
-          done();
-        });
-    });
-
     /////////////////////////////////////////////////////////////////////////////////
     //
     // GET GRID