===> Cleaning for refi-3.2.1