Removed routes
Updated model
Removed unnecessary if