diff --git a/src/controllers/index.js b/src/controllers/index.js
index 7a2f225290..59bf03994c 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -24,7 +24,6 @@ var Controllers = {
 	users: require('./users'),
 	groups: require('./groups'),
 	accounts: require('./accounts'),
-	static: require('./static'),
 	api: require('./api'),
 	admin: require('./admin')
 };
diff --git a/src/controllers/static.js b/src/controllers/static.js
deleted file mode 100644
index a2355ef8dd..0000000000
--- a/src/controllers/static.js
+++ /dev/null
@@ -1,23 +0,0 @@
-"use strict";
-
-var staticController = {};
-
-createStatic('404');
-createStatic('403');
-createStatic('500');
-
-function createStatic(statusCode) {
-	staticController[statusCode] = function(req, res) {
-		if (!res.locals.isAPI) {
-			res.statusCode = parseInt(statusCode, 10);
-		}
-
-		res.render(statusCode, {
-			errorMessage: req.flash('errorMessage')[0] || undefined
-		});
-	};
-}
-
-module.exports = staticController;
-
-
diff --git a/src/routes/index.js b/src/routes/index.js
index 2ebf77d53e..437f19359d 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -32,12 +32,6 @@ function mainRoutes(app, middleware, controllers) {
 	setupPageRoute(app, '/tos', middleware, [], controllers.termsOfUse);
 }
 
-function staticRoutes(app, middleware, controllers) {
-	setupPageRoute(app, '/404', middleware, [], controllers.static['404']);
-	setupPageRoute(app, '/403', middleware, [], controllers.static['403']);
-	setupPageRoute(app, '/500', middleware, [], controllers.static['500']);
-}
-
 function topicRoutes(app, middleware, controllers) {
 	app.get('/api/topic/teaser/:topic_id', controllers.topics.teaser);
 
@@ -134,7 +128,6 @@ module.exports = function(app, middleware) {
 	*/
 
 	mainRoutes(router, middleware, controllers);
-	staticRoutes(router, middleware, controllers);
 	topicRoutes(router, middleware, controllers);
 	tagRoutes(router, middleware, controllers);
 	categoryRoutes(router, middleware, controllers);
@@ -199,7 +192,7 @@ function handle404(app, middleware) {
 			res.status(404);
 
 			if (res.locals.isAPI) {
-				return res.json({path: req.path, error: 'not-found'});
+				return res.json({path: req.path});
 			}
 
 			middleware.buildHeader(req, res, function() {