Issue #164: Removing entity type and bundle properties from Entity class.