===> Cleaning for xplr-1.1.0