===> Cleaning for unshield-1.6.2