channels/disp: cleanup