nav cleanups