===> Cleaning for yed-3.17