[auto_group] more cleanup...