clean-up and added route.