diff --git a/config/env/all.js b/config/env/all.js
index c814a775..f49acb5b 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -7,7 +7,7 @@ module.exports = {
 		description: process.env.APP_DESC || 'Opensource form builder alternative to TypeForm',
 		keywords:  process.env.APP_KEYWORDS || 'typeform, pdfs, forms, opensource, formbuilder, google forms, nodejs'
 	},
-	port: process.env.PORT || 3000,
+	port: process.env.PORT || 5000,
 	socketPort: process.env.SOCKET_PORT || 35729,
 
 	templateEngine: 'swig',
diff --git a/config/env/development.js b/config/env/development.js
index 2df8fcf0..5acc4687 100755
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-	baseUrl: process.env.BASE_URL || 'http://localhost:3000',
+	baseUrl: process.env.BASE_URL || 'http://localhost:5000',
 	db: {
 		uri: 'mongodb://localhost/mean',
 		options: {
diff --git a/config/env/local.js b/config/env/local.js
deleted file mode 100644
index 48b2534a..00000000
--- a/config/env/local.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-var mandrill_api_key = 'AVCCf1C2dFlrNhx9Iyi_yQ';
-
-//Use mandrill mock API_key if we are testing
-// if(process.env.NODE_ENV === 'test')  mandrill_api_key = '_YNOKLgT9DGb2sgVGR66yQ';
-
-module.exports = {
-	// db: {
-	//     uri: 'mongodb://localhost/local-dev',
-	//     options: {
-	//       user: '',
-	//       pass: ''
-	//     }
-	// },
-	sessionSecret: process.env.SESSION_SECRET || 'somethingheresecret',
-};
\ No newline at end of file
diff --git a/config/env/production-dev.js b/config/env/production-dev.js
deleted file mode 100644
index 7b1e1a03..00000000
--- a/config/env/production-dev.js
+++ /dev/null
@@ -1,65 +0,0 @@
-'use strict';
-
-module.exports = {
-	baseUrl: process.env.BASE_URL || 'dev.tellform.com',
-	db: {
-		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
-		options: {
-			user: 'admin',
-			pass: process.env.MONGOLAB_PASS || 'admin'
-		}
-	},
-	log: {
-		// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
-		format: 'dev',
-		// Stream defaults to process.stdout
-		// Uncomment to enable logging to a log on the file system
-		options: {
-			stream: 'access.log'
-		}
-	},
-	sessionCookie: {
-		domain: process.env.BASE_URL || 'dev.tellform.com'
-	},
-	assets: {
-		css: 'public/dist/application.min.css',
-		js: 'public/dist/application.min.js'
-	},
-	facebook: {
-		clientID: process.env.FACEBOOK_ID || 'APP_ID',
-		clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
-		callbackURL: '/auth/facebook/callback'
-	},
-	twitter: {
-		clientID: process.env.TWITTER_KEY || 'CONSUMER_KEY',
-		clientSecret: process.env.TWITTER_SECRET || 'CONSUMER_SECRET',
-		callbackURL: '/auth/twitter/callback'
-	},
-	google: {
-		clientID: process.env.GOOGLE_ID || 'APP_ID',
-		clientSecret: process.env.GOOGLE_SECRET || 'APP_SECRET',
-		callbackURL: '/auth/google/callback'
-	},
-	linkedin: {
-		clientID: process.env.LINKEDIN_ID || 'APP_ID',
-		clientSecret: process.env.LINKEDIN_SECRET || 'APP_SECRET',
-		callbackURL: '/auth/linkedin/callback'
-	},
-	github: {
-		clientID: process.env.GITHUB_ID || 'APP_ID',
-		clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
-		callbackURL: '/auth/github/callback'
-	},
-	mailer: {
-		from: process.env.MAILER_FROM || 'no-reply@dev.tellform.com',
-		options: {
-			service: process.env.MAILER_SERVICE_PROVIDER || '',
-			secure: false,
-			requireTLS: true,
-			auth: {
-				user: process.env.MAILER_EMAIL_ID || '',
-				pass: process.env.MAILER_PASSWORD || ''
-			}
-		}
-	}
-};
diff --git a/config/express.js b/config/express.js
index 26745896..dfe88bf9 100755
--- a/config/express.js
+++ b/config/express.js
@@ -53,7 +53,7 @@ module.exports = function(db) {
 	app.locals.description = config.app.description;
 	app.locals.keywords = config.app.keywords;
 	app.locals.socketPort = config.socketPort;
-	
+
 	app.locals.bowerJSFiles = config.getBowerJSAssets();
 	app.locals.bowerCssFiles = config.getBowerCSSAssets();
 	app.locals.bowerOtherFiles = config.getBowerOtherAssets();
diff --git a/config/socket.io.js b/config/socket.io.js
index 25c3a22b..66e429f7 100644
--- a/config/socket.io.js
+++ b/config/socket.io.js
@@ -4,8 +4,7 @@
 var config = require('./config'),
 	path = require('path'),
 	http = require('http'),
-	socketio = require('socket.io'),
-	session = require('express-session');
+	socketio = require('socket.io');
 
 // Define the Socket.io configuration method
 module.exports = function (app, db) {
diff --git a/public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html
index a297445a..c66184f1 100644
--- a/public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html
+++ b/public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html
@@ -113,12 +113,7 @@
 					</th>
 
 					<td data-ng-repeat="field in row.form_fields">
-						<span ng-if="field.fieldValue == 'dropdown'">
-							{{field.fieldValue}}
-						</span>
-						<span ng-if="field.fieldValue != 'dropdown'">
-							{{field.fieldValue}}
-						</span>
+						{{field.fieldValue}}
 					</td>
 					<td ng-if="myform.plugins.oscarhost.baseUrl">
 						<a href="{{myform.plugins.oscarhost.baseUrl.split('ws')[0]}}demographic/demographiccontrol.jsp?demographic_no={{row.oscarDemoNum}}&displaymode=edit">