Removing early exit