===> Cleaning for apr-1.7.0nb1