[~] More cleaning of the mux decoder and the combiner