FIX adding missing return statement on remove_group_by_name