Update to new comm api
Prepare for deletion