cleanup/refactor MSC