Fixing channel drop (cleanup in other tables + order of reference drop)

Created by  pmeunier  on April 26, 2021
VSOT2QH5OFG6XX6P7TXZF62IDA2FL7PSEPA2YJCAEFQNJTD5MMLAC
Change contents