MechUC cleanup