Refactor cancel out of entity class