===> Cleaning for apr-1.5.0