Hotfix/remove obsolete groups from lists