===> Cleaning for john-1.8.0