MSC2 API cleanup (WIP)