Removed two entity_wrapper calls