===> Cleaning for refi-3.1.1