[msc] more code cleanup