Removed EntityBuilder