Remove only_if block