Adapt to class move in core-api; rem unsed fields