fixup! Cleanup of Partition and its uses