Elimiante some wackyness in the route.