Major clean in the code + suppression of channelSet + add comments
 merging ...