diff --git a/app.js b/app.js
index a9b452ba35..013ea287fc 100644
--- a/app.js
+++ b/app.js
@@ -242,7 +242,7 @@ function reset() {
 
 function shutdown(code) {
 	winston.info('[app] Shutdown (SIGTERM/SIGINT) Initialised.');
-	db.close();
+	require('./src/database').close();
 	winston.info('[app] Database connection closed.');
 
 	winston.info('[app] Shutdown complete.');
diff --git a/src/webserver.js b/src/webserver.js
index 47c1c9c0ca..810aa284b7 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -40,7 +40,6 @@ if(nconf.get('ssl')) {
 (function (app) {
 	"use strict";
 
-	// this can be moved to app.js
 	var	clientScripts;
 
 	plugins.ready(function() {