nav cleanup 2