cleanup, routes changes