navigation cleanup