[nav_graph] cleanups