removing early exit