Refine routes
Remove duplicated and unused routes
Merge pull request #252 from camsong/cam/refine-routes

Refine routes