core: Stop using oldcomm