Cleaning up a mess in routing.