some cleanup to the navigation package