CoreObject getEntity() clean-up