More removal of direct IC2 api references