bench:mco: clean up and fix