Clean up after merge for comms removal