diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js
index 24b05cd7..85d2d01a 100644
--- a/app/routes/forms.server.routes.js
+++ b/app/routes/forms.server.routes.js
@@ -9,25 +9,25 @@ var users = require('../../app/controllers/users.server.controller'),
 	config = require('../../config/config');
 
 // Setting the pdf upload route and folder
-// var upload = multer({ dest: config.tmpUploadPath,
-// 		rename: function (fieldname, filename) {
-// 		    return Date.now();
-// 		},
-// 		onFileUploadStart: function (file) {
-// 			//Check to make sure we can only upload images and pdfs
-// 		  	console.log(file.originalname + ' is starting ...');
-// 		},
-// 		onFileUploadComplete: function (file, req, res) {
-// 			console.log(file.originalname + ' uploaded to  ' + file.path);
-// 			// console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
-// 			// res.status(200).send(file);
-// 		}
-// 	});
+var upload = multer({ dest: config.tmpUploadPath,
+		rename: function (fieldname, filename) {
+		    return Date.now();
+		},
+		onFileUploadStart: function (file) {
+			//Check to make sure we can only upload images and pdfs
+		  	console.log(file.originalname + ' is starting ...');
+		},
+		onFileUploadComplete: function (file, req, res) {
+			console.log(file.originalname + ' uploaded to  ' + file.path);
+			// console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
+			// res.status(200).send(file);
+		}
+	});
 
 module.exports = function(app) {
 	// Form Routes
 	app.route('/upload/pdf')
-		.post(users.requiresLogin, forms.uploadPDF);
+		.post(users.requiresLogin, upload.single('file'), forms.uploadPDF);
 
 	app.route('/forms')
 		.get(users.requiresLogin, forms.list)
diff --git a/config/config.js b/config/config.js
index bd5eeb99..741f4e07 100755
--- a/config/config.js
+++ b/config/config.js
@@ -50,17 +50,14 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
 		if (urlRegex.test(globPatterns)) {
 			output.push(globPatterns);
 		} else {
-			glob(globPatterns, {
-				sync: true
-			}, function(err, files) {
-				if (removeRoot) {
-					files = files.map(function(file) {
-						return file.replace(removeRoot, '');
-					});
-				}
+			var files = glob.sync(globPatterns)
+			if (removeRoot) {
+				files = files.map(function(file) {
+					return file.replace(removeRoot, '');
+				});
+			}
 
-				output = _.union(output, files);
-			});
+			output = _.union(output, files);
 		}
 	}
 
diff --git a/config/express.js b/config/express.js
index eeee1158..23b672e1 100755
--- a/config/express.js
+++ b/config/express.js
@@ -108,22 +108,6 @@ module.exports = function(db) {
 	app.use('/', express.static(path.resolve('./public')));
 	app.use('/uploads', express.static(path.resolve('./uploads')));
 
-	// Setting the pdf upload route and folder
-	app.use(multer({ dest: config.tmpUploadPath,
-		rename: function (fieldname, filename) {
-		    return Date.now();
-		},
-		onFileUploadStart: function (file) {
-			//Check to make sure we can only upload images and pdfs
-		  	console.log(file.originalname + ' is starting ...');
-		},
-		onFileUploadComplete: function (file, req, res) {
-			console.log(file.originalname + ' uploaded to  ' + file.path);
-			// console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
-			// res.status(200).send(file);
-		}
-	}));
-
 	// CookieParser should be above session
 	app.use(cookieParser());