More cleanup to repartitioner