fix(auth): Fix merge errors from rebase

server/boot/user.js

@@ -3,7 +3,6 @@ import moment from 'moment-timezone';
 import { Observable } from 'rx';
 import debugFactory from 'debug';
 import emoji from 'node-emoji';
-import uuid from 'node-uuid';
 
 import {
   frontEndChallengeId,
@@ -423,20 +422,6 @@ module.exports = function(app) {
     });
   }
 
-  function getEmailSignup(req, res) {
-    if (req.user) {
-      return res.redirect('/');
-    }
-    if (isSignUpDisabled) {
-      return res.render('account/beta', {
-        title: 'New sign ups are disabled'
-      });
-    }
-    return res.render('account/email-signup', {
-      title: 'Sign up for freeCodeCamp using your Email Address'
-    });
-  }
-
   function getAccount(req, res) {
     const { username } = req.user;
     return res.redirect('/' + username);