===> Cleaning for yap-6.2.2