===> Cleaning for ximaging-1.6