===> Cleaning for yadm-3.1.1