===> Cleaning for jo-1.7