diff --git a/lib/cartodb/controllers/api-router.js b/lib/cartodb/controllers/api-router.js
index fe701985..537be27b 100644
--- a/lib/cartodb/controllers/api-router.js
+++ b/lib/cartodb/controllers/api-router.js
@@ -209,8 +209,8 @@ module.exports = class ApiRouter {
         const paths = [
             '/api/v1',
             '/user/:user/api/v1',
-            '/tiles',
-            '/database/:dbname'
+            '/tiles', // Deprecated
+            '/database/:dbname' // Deprecated: used in ported test from windshaft
         ];
 
         app.use(`(?:${paths.join('|')})`, apiRouter);
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 1891e208..adc03003 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -49,12 +49,14 @@ module.exports = {
         port: global.environment.port,
         host: global.environment.host
     },
+    // FIXME: Remove it. This is no longer needed, paths are defined in routers
     // This is for inline maps and table maps
     base_url: global.environment.base_url_legacy || '/tiles/:table',
 
     /// @deprecated with Windshaft-0.17.0
     ///base_url_notable: '/tiles',
 
+    // FIXME: Remove it. This is no longer needed, paths are defined in routers
     // This is for Detached maps
     //
     // "maps" is the official, while
@@ -62,6 +64,7 @@ module.exports = {
     //
     base_url_mapconfig: global.environment.base_url_detached || '(?:/maps|/tiles/layergroup)',
 
+    // FIXME: Remove it. This is no longer needed, paths are defined in routers
     base_url_templated: global.environment.base_url_templated || '(?:/maps/named|/tiles/template)',
 
     grainstore: {
diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js
index 8b8ec339..1ce262af 100644
--- a/test/acceptance/ported/support/ported_server_options.js
+++ b/test/acceptance/ported/support/ported_server_options.js
@@ -7,7 +7,9 @@ var overviewsQueryRewriter = new OverviewsQueryRewriter({
 });
 
 module.exports = _.extend({}, serverOptions, {
+    // FIXME: Remove it. This is no longer needed, paths are defined in routers
     base_url: '/database/:dbname/table/:table',
+    // FIXME: Remove it. This is no longer needed, paths are defined in routers
     base_url_mapconfig: '/database/:dbname/layergroup',
     grainstore: {
         datasource: {