Navigation clean up