Get rid of EntityID