===> Cleaning for xteddy-2.2