===> Cleaning for jj-0.18.0