Navcontrol cleanup