Remove checks on $entity attribute