===> Cleaning for jj-0.16.0