Added empty group cleanup