[Compaction] Cleanup II