Refactored userModel
Cleaned up unused files