mono integration cleanup