MSC2 services API cleanup (WIP)