diff --git a/lib/units/auth/openid.js b/lib/units/auth/openid.js
index ee23992f..8791d6b1 100644
--- a/lib/units/auth/openid.js
+++ b/lib/units/auth/openid.js
@@ -5,40 +5,24 @@ var querystring = require('querystring');
 var openid = require('openid');
 var express = require('express')
 var urljoin = require('url-join')
-var validator = require('express-validator')
-var cookieSession = require('cookie-session')
-var bodyParser = require('body-parser')
-var serveStatic = require('serve-static')
-var csrf = require('csurf')
-var Promise = require('bluebird')
 
 var logger = require('../../util/logger')
-var requtil = require('../../util/requtil')
 var jwtutil = require('../../util/jwtutil')
-var pathutil = require('../../util/pathutil')
 var urlutil = require('../../util/urlutil')
-var lifecycle = require('../../util/lifecycle')
-
-var extensions = [new openid.SimpleRegistration({
-                    "email" : true,
-                    "fullname" : true,
-                  })];
-
 
 module.exports = function(options) {
-  var verifyUrl = urljoin(options.appUrl, "/auth/verify");
-
+  var extensions = [new openid.SimpleRegistration({
+    "email" : true,
+    "fullname" : true,
+  })];
   var relyingParty = new openid.RelyingParty(
-    verifyUrl,
+    urljoin(options.appUrl, "/auth/verify"),
     null,  // Realm (optional, specifies realm for OpenID authentication)
     false, // Use stateless verification
     false, // Strict mode
-    extensions);
-
-
-  var log = logger.createLogger('auth-openid'),
-    app = express(),
-    server = Promise.promisifyAll(http.createServer(app))
+    extensions)
+  var log = logger.createLogger('auth-openid');
+  var app = express();
 
   app.set('strict routing', true)
   app.set('case sensitive routing', true)
@@ -48,7 +32,7 @@ module.exports = function(options) {
   })
 
   app.get('/auth/openid/', function(req, res) {
-  log.info('openid identifier url: %s', options.identifierUrl)
+    log.info('openid identifier url: %s', options.identifierUrl)
     relyingParty.authenticate(options.identifierUrl, false, function(err, authUrl){
       if (err){
         res.send("auth failed");
@@ -84,6 +68,6 @@ module.exports = function(options) {
     })
   });
 
-  server.listen(options.port)
+  http.createServer(app).listen(options.port)
   log.info('Listening on port %d', options.port)
 }