mapnav cleanup