More cleanup on grouping deletion.