Navigation clean up.