Majordomo cleanup