clean up routing names and such