Cleaned up excess code not being used and added role functions to user restmod model.