===> Cleaning for jo-1.9