===> Cleaning for jnv-0.7.0