MATE cleanup (C3 only)