diff --git a/server/boot/authentication.js b/server/boot/authentication.js
index a87cd08161..3ccd6de22e 100644
--- a/server/boot/authentication.js
+++ b/server/boot/authentication.js
@@ -1,4 +1,4 @@
-module.exports = function enableAuthentication(server) {
+module.exports = function enableAuthentication(app) {
   // enable authentication
-  server.enableAuth();
+  app.enableAuth();
 };
diff --git a/server/boot/explorer.js b/server/boot/explorer.js
index de40021e5f..7461836f63 100644
--- a/server/boot/explorer.js
+++ b/server/boot/explorer.js
@@ -1,11 +1,11 @@
-module.exports = function mountLoopBackExplorer(server) {
+module.exports = function mountLoopBackExplorer(app) {
   var explorer;
   try {
     explorer = require('loopback-explorer');
   } catch(err) {
-    // Print the message only when the app was started via `server.listen()`.
+    // Print the message only when the app was started via `app.listen()`.
     // Do not print any message when the project is used as a component.
-    server.once('started', function() {
+    app.once('started', function() {
       console.log(
         'Run `npm install loopback-explorer` to enable the LoopBack explorer'
       );
@@ -13,12 +13,12 @@ module.exports = function mountLoopBackExplorer(server) {
     return;
   }
 
-  var restApiRoot = server.get('restApiRoot');
+  var restApiRoot = app.get('restApiRoot');
 
-  var explorerApp = explorer(server, { basePath: restApiRoot });
-  server.use('/explorer', explorerApp);
-  server.once('started', function() {
-    var baseUrl = server.get('url').replace(/\/$/, '');
+  var explorerApp = explorer(app, { basePath: restApiRoot });
+  app.use('/explorer', explorerApp);
+  app.once('started', function() {
+    var baseUrl = app.get('url').replace(/\/$/, '');
     // express 4.x (loopback 2.x) uses `mountpath`
     // express 3.x (loopback 1.x) uses `route`
     var explorerPath = explorerApp.mountpath || explorerApp.route;
diff --git a/server/boot/fieldGuide.js b/server/boot/fieldGuide.js
index e5d8d784c3..c3275e6f62 100644
--- a/server/boot/fieldGuide.js
+++ b/server/boot/fieldGuide.js
@@ -1,7 +1,6 @@
 var R = require('ramda'),
     express = require('express'),
     // debug = require('debug')('freecc:fieldguides'),
-    FieldGuide = require('../../common/models/FieldGuide'),
     resources = require('../resources/resources');
 
 var router = express.Router();
diff --git a/server/boot/restApi.js b/server/boot/restApi.js
index 256579a813..e81c692006 100644
--- a/server/boot/restApi.js
+++ b/server/boot/restApi.js
@@ -1,4 +1,4 @@
-module.exports = function mountRestApi(server) {
-  var restApiRoot = server.get('restApiRoot');
-  server.use(restApiRoot, server.loopback.rest());
+module.exports = function mountRestApi(app) {
+  var restApiRoot = app.get('restApiRoot');
+  app.use(restApiRoot, app.loopback.rest());
 };