nav code cleanup