===> Cleaning for jj-0.17.1