Started Cleaning up Routes