Remove "isDefined" checking