MO API cleanup