Partitioner: Cleanup