===> Cleaning for jj-0.8.0