===> Cleaning for bzrtools-2.5.0