diff --git a/routes/auth.js b/routes/auth.js
index bf26ecd..22c9bf0 100644
--- a/routes/auth.js
+++ b/routes/auth.js
@@ -3,7 +3,6 @@ const Express = require('express');
 const ResetModel = require('../models/reset');
 const Router = Express.Router();
 const Token = require('../modules/token');
-const UserModel = require('../models/user');
 
 Router.route('/login')
   .post((req, res, next) => {
@@ -55,23 +54,6 @@ Router.route('/login')
 		UserModel.authenticateUser(AuthEvents, data, headers);
 	});
 	
-Router.route('/reset/godmode')
-  .get((req, res) => {
-    var ResetEvents = new EventEmitter();
-    
-    ResetEvents.once('getResets', (err, result) => {
-			if (err) {
-				res.status(500).json({ message: 'There was a problem executing your request', err: err });
-			}
-			
-			if (result) {
-				res.status(200).json(result);
-			}		
-    });
-    
-    ResetModel.getResets(ResetEvents);
-  });
-  
 Router.route('/reset/:id?/:token?')
   .get((req, res) => {
     var id = req.params.id ? decodeURIComponent(req.params.id) : false;
@@ -129,25 +111,6 @@ Router.route('/reset/:id?/:token?')
     UserModel.updatePassword(UserEvents, id, token, data);
   });
   
-Router.route('/godmode/:username?')
-  .patch((req, res) => {
-    var username = req.params.username ? decodeURIComponent(req.params.username) : false;
-    var password = req.body;
-    var UserEvents = new EventEmitter();
-
-    UserEvents.once('adminUpdatePassword', (err, result) => {
-      if (err) {
-        res.status(500).json({ message: err.message, err: err });
-      }
-    
-      if (result) {
-        res.status(200).json(result);
-      }		
-    });
-
-    UserModel.adminUpdatePassword(UserEvents, username, password);
-  });
-
 Router.route('/session')
   .get((req, res) => {
     var AuthEvents = new EventEmitter();
diff --git a/routes/profiles.js b/routes/profiles.js
index 53eb3de..5956387 100644
--- a/routes/profiles.js
+++ b/routes/profiles.js
@@ -204,6 +204,7 @@ Router.route('/:id?')
       
       var ProfileEvents = new EventEmitter();
       var id = req.params.id || null;
+      var method = id ? 'get' : 'all';
 
       ProfileEvents.once(method, (err, result) => {
         if (err) {
@@ -215,7 +216,7 @@ Router.route('/:id?')
         }		
       });
 
-      Profiles.get(ProfileEvents, id || null);
+      Profiles[method](ProfileEvents, id);
     });
 	})
 	.patch( update )