Cleaning up links/routes