Update menage and remove XC-related cleanup