===> Cleaning for nq-0.5