partitioning changes and cleaning