Remove json and clean up routes