ISSUE#130, ISSUE#128
Removed routes and user from route where it is no longer used.