navigation clean up