===> Cleaning for xplr-1.2.1