preparing to generalize NavController
cleanup