MDL-31989: Implemented MUC + comments + remove unwanted code