===> Cleaning for jnv-0.6.0