diff --git a/app/controllers/core.server.controller.js b/app/controllers/core.server.controller.js
index eb620c15..1ad1306c 100755
--- a/app/controllers/core.server.controller.js
+++ b/app/controllers/core.server.controller.js
@@ -13,6 +13,9 @@ exports.index = function(req, res) {
 };
 
 exports.form = function(req, res) {
+	//Allow form to be embeded
+        res.removeHeader('X-Frame-Options');
+
 	res.render('form', {
 		user: req.user || null,
 		request: req
diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js
index d121a098..4fd4d301 100644
--- a/app/controllers/forms.server.controller.js
+++ b/app/controllers/forms.server.controller.js
@@ -285,10 +285,6 @@ exports.read = function(req, res) {
 	var newForm = req.form.toJSON({virtuals : true});
 	newForm.plugins.oscarhost.settings.validUpdateTypes = validUpdateTypes;
 
-	if(newForm){
-		return res.json(newForm);
-	}
-
 	if (req.userId) {
 		if(req.form.admin._id+'' === req.userId+''){
 			return res.json(newForm);
@@ -296,14 +292,9 @@ exports.read = function(req, res) {
 		return res.status(404).send({
 			message: 'Form Does Not Exist'
 		});
-	}else {
-	 if(newForm) return res.json(newForm);
 	}
-
-	/*return res.status(404).send({
-		message: 'Form Does Not Exist'
-	});*/
-
+	return res.json(newForm);
+	
 };
 
 /**
diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js
index 4ba1ab4d..2bcb6332 100644
--- a/app/routes/forms.server.routes.js
+++ b/app/routes/forms.server.routes.js
@@ -29,10 +29,6 @@ module.exports = function(app) {
 	app.route('/upload/pdf')
 		.post(users.requiresLogin, upload.single('file'), forms.uploadPDF);
 
-	//TODO: Need to finish this for file upload field
-	//app.route('/forms/:formId([a-zA-Z0-9]+)/upload')
-	//	.post(forms.uploadSubmissionFile);
-
 	app.route('/forms')
 		.get(users.requiresLogin, forms.list)
 		.post(users.requiresLogin, forms.create);