Cleaning up routes and index