diff --git a/init.js b/init.js
index <HASH>..<HASH> 100644
--- a/init.js
+++ b/init.js
@@ -1,5 +1,5 @@
 "use strict";
-var mode = 'dev';
+var mode = process.env['ROADS_ENV'] || 'dev';
 
 var Models = require('roads-models');
 require('./libs/roadsmodelpromise.js').mixin(Models.ModelRequest.prototype);
@@ -113,4 +113,4 @@ module.exports.webserver = function (fn) {
       }
 
       return server;
-};
\ No newline at end of file
+};
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -5,11 +5,6 @@
 * MIT Licensed
  */
 
-// This file sucks. Todo: make this suck less
-
-var mode = 'dev';
-//var mode = 'prod';
-
 var init = require('./init');
 
 init.config();
allow environment to be defined through the ROADS_ENV variable