Navigation cleanup