Clean up some navigation.