cleanup navigation helpers