fixup! Cleanup of Partition and its uses
fixup! Cleanup of Partition and its uses