cleanup to nav migration