Partition cleanup: Round 1