Fix routes and remove comments