Remove un-used code.
Enabling the entity validation to old installations.