===> Cleaning for ximaging-1.7