Bug/131/internal channel cleanup