Cleaned up the routes