diff --git a/app/__init__.py b/app/__init__.py
index aa6e8389c72d5d6dabf2057eb6736e6b94dbe0c9..24841eab32837824bd4b19abec8f43afb33afcd5 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -21,10 +21,6 @@ def create_app(config_name):
     def index():
         global return_url
 
-        #if 'username' not in session:
-        #   session['username'] = "name_test" + str(random.randint(0, 10000))
-        #   #session['username'] = session['bid']
-
         if 'uid' not in session:
             session['uid']=str(uuid.uuid4())
 
@@ -32,7 +28,6 @@ def create_app(config_name):
             return_url = request.args.get("redir") or "/pun/sys/dashboard"
 
         return render_template('auth/SignUp.html', room_id=session['uid'])
-        #return render_template('auth/SignUp.html', user=session['username'], room_id=session['uid'])
 
     # misc page error catching
     @app.errorhandler(403)
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index ca165a18f6a536ad0165a02db74828aa0e09ff3e..8b109f4ee3154c2503e63538e7e7e14737887d4f 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -11,9 +11,6 @@
     var socket = io.connect('http://' + document.domain + ':' + location.port);
 
     socket.on( 'connect', function() {
-       /* socket.emit( 'user connected', {
-          user: document.getElementById("username").innerText
-        } ) */
         socket.emit( 'join_room' )
 
         socket.on( 'creating account', function( msg ) {
diff --git a/tasks.py b/tasks.py
index 8eb674bb96fd99125bde1b54764445464bfd4481..f596d1d231d5e1dd9ccda5d8614708a1190adf04 100644
--- a/tasks.py
+++ b/tasks.py
@@ -7,10 +7,8 @@ from gevent import monkey
 monkey.patch_all(subprocess=True)
 
 broker_url = 'amqp://reggie:reggie@ohpc:5672/'
-#broker_url = 'amqp://'
 celery = Celery('flask_user_reg', broker=broker_url)
 
-#socketio = SocketIO(message_queue='amqp:///socketio')
 socketio = SocketIO(message_queue='amqp://reggie:reggie@ohpc:5672/socketio')
 
 def send_msg(event, room):
@@ -20,14 +18,9 @@ def send_msg(event, room):
 @celery.task
 def celery_create_account(username, fullname, reason, session):
     room = session
-    # Todo: Ravi's and Louis's code goes here
     print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
     send_msg('creating account', room)
-    #socketio.emit("creating account", room=room)
     print(username)
     subprocess.call(["/opt/rabbitmq_agents/flask_producer.py", "ohpc_account_create", username])
-    #time.sleep(5)
     print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tAccount successfully created for ' + username)
     send_msg('account ready', room)
-    #socketio.emit('account ready', room=room)
-