diff --git a/models/user.js b/models/user.js
index 7435608..031d0ce 100644
--- a/models/user.js
+++ b/models/user.js
@@ -1,17 +1,14 @@
 const Authentication = require('../modules/authentication');
 const Mongoose = require('mongoose');
 const Reset = require('./reset');
-const Settings = require('./settings');
 
 const UserSchema = new Mongoose.Schema({
-	userName: { type: String, required: true, unique: true },
+	username: { type: String, required: true, unique: true },
 	password: { type: String },
 	name: { first: { type: String, required: true }, last: { type: String, required: true } },
-	title: String,
 	email: { type: String, required: true, unique: true },
-	permission: { type: Mongoose.Schema.Types.ObjectId, ref: 'roles', required: true, default: '59e6e1ab9bd9c04c803a0bc0' },
+	permission: { type: Mongoose.Schema.Types.ObjectId, ref: 'roles', required: false, default: null },
 	avatar: String,
-	settings: [ Settings.schema ],
 	forceReset: { type: Boolean, default: true },
 	updated_at: { type: Date, default: Date.now }
 });
@@ -527,52 +524,6 @@ module.exports = {
 		});
 	},
 	
-	getUserSetting: (e, id, key) => {
-		const promise = new Promise((resolve, reject) => {
-			UserModel.findOne({ _id: id }, (err, result) => {
-				if (err) {
-					reject(err);
-				}
-
-				if (result) {
-				  for (let i = 0; i < result.settings.length; i ++) {
-				    if (result.settings[i].key === key) resolve(result.settings[i]);
-				  }
-
-					reject({ method: "getUserSetting", error: "The specified settings key does not exist" });
-				}
-			});
-		});
-
-		promise.then((result) => {
-			e.emit('getUserSetting', null, result);
-		})
-		.catch((err) => {
-			e.emit('getUserSetting', err, null);
-		});
-	},
-
-	getUserSettings: (e, id) => {
-		const promise = new Promise((resolve, reject) => {
-			UserModel.findOne({_id: id}, (err, result) => {
-				if (err) {
-					reject(err);
-				}
-
-				if (result) {
-					resolve(result.settings);
-				}
-			});
-		});
-
-		promise.then((result) => {
-			e.emit('getUserSettings', null, result);
-		})
-		.catch((err) => {
-			e.emit('getUserSettings', err, null);
-		});
-	},
-	
 	isUserNameUnique: (e, username) => {
 	  const promise = new Promise((resolve, reject) => {
 	    UserModel.findOne({ userName: username }, (err, result) => {