clean up routes (not quite all of them yet)