Clean-up communication channels

Use one single exit channel