Remove some inserted code related to the navigation controller