more nav cleanup