diff --git a/core/server/controllers/entry.js b/core/server/controllers/entry.js
deleted file mode 100644
index 40f6ad6d8d..0000000000
--- a/core/server/controllers/entry.js
+++ /dev/null
@@ -1,59 +0,0 @@
-var urlService = require('../services/url'),
-    filters = require('../filters'),
-    handleError = require('./frontend/error'),
-    postLookup = require('./frontend/post-lookup'),
-    renderEntry = require('./frontend/render-entry'),
-    setRequestIsSecure = require('./frontend/secure');
-
-// This here is a controller.
-// It renders entries = individual posts or pages
-// The "route" is handled in site/routes.js
-module.exports = function entryController(req, res, next) {
-    // Note: this is super similar to the config middleware used in channels
-    // @TODO refactor into to something explicit
-    res._route = {
-        type: 'entry'
-    };
-
-    // Query database to find post
-    return postLookup(req.path).then(function then(lookup) {
-        // Format data 1
-        var post = lookup ? lookup.post : false;
-
-        if (!post) {
-            return next();
-        }
-
-        // CASE: postlookup can detect options for example /edit, unknown options get ignored and end in 404
-        if (lookup.isUnknownOption) {
-            return next();
-        }
-
-        // CASE: last param is of url is /edit, redirect to admin
-        if (lookup.isEditURL) {
-            return urlService.utils.redirectToAdmin(302, res, '/editor/' + post.id);
-        }
-
-        //
-        /**
-         * CASE: Permalink is not valid anymore, we redirect him permanently to the correct one
-         *       This usually only happens if you switch to date permalinks or if you have date permalinks
-         *       enabled and the published date changes.
-         *
-         * @NOTE
-         *
-         * The resource url (post.url) always contains the subdirectory. This was different before dynamic routing.
-         * Because with dynamic routing we have a service which knows where a resource lives - and this includes the
-         * subdirectory. Otherwise every time we use a resource url, we would need to take care of the subdirectory.
-         * That's why we have to use the original url, which contains the sub-directory.
-         */
-        if (post.url !== req.originalUrl) {
-            return urlService.utils.redirect301(res, post.url);
-        }
-
-        setRequestIsSecure(req, post);
-
-        filters.doFilter('prePostsRender', post, res.locals)
-            .then(renderEntry(req, res));
-    }).catch(handleError(next));
-};
diff --git a/core/server/controllers/preview.js b/core/server/controllers/preview.js
deleted file mode 100644
index db5c2cd9d3..0000000000
--- a/core/server/controllers/preview.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var api = require('../api'),
-    urlService = require('../services/url'),
-    filters = require('../filters'),
-    handleError = require('./frontend/error'),
-    renderEntry = require('./frontend/render-entry'),
-    setRequestIsSecure = require('./frontend/secure');
-
-// This here is a controller.
-// The "route" is handled in site/routes.js
-module.exports = function previewController(req, res, next) {
-    var params = {
-        uuid: req.params.uuid,
-        status: 'all',
-        include: 'author,authors,tags'
-    };
-
-    // Note: this is super similar to the config middleware used in channels
-    // @TODO refactor into to something explicit
-    res._route = {
-        type: 'entry'
-    };
-
-    api.posts.read(params).then(function then(result) {
-        // Format data 1
-        var post = result.posts[0];
-
-        if (!post) {
-            return next();
-        }
-
-        if (req.params.options && req.params.options.toLowerCase() === 'edit') {
-            // CASE: last param is of url is /edit, redirect to admin
-            return urlService.utils.redirectToAdmin(302, res, '/editor/' + post.id);
-        } else if (req.params.options) {
-            // CASE: unknown options param detected. Ignore and end in 404.
-            return next();
-        }
-
-        if (post.status === 'published') {
-            return urlService.utils.redirect301(res, urlService.getUrlByResourceId(post.id));
-        }
-
-        setRequestIsSecure(req, post);
-
-        filters.doFilter('prePostsRender', post, res.locals)
-            .then(renderEntry(req, res));
-    }).catch(handleError(next));
-};