clean up routes, data still not holding right data