Begin removing references to partitions