Clean up NavigationContext