Issue #3442713 by smustgrave, catch, Binoli Lalani, longwave: Remove deprecated code from the entity system