Remove unnecessary NavigationController