navigation clean-up