Fix group cleanup