Cleanup the communication-range related remainders