Navigation: Decoupled clean up variables