Remove unused option defer-until-present option