Fix request timing issues and clean up routes.