===> Cleaning for ykpers-1.6.3