Removed the deprecated entity classes

These classes are triggering a deprecation warning since more than 1 year now IIRC.