===> Cleaning for finch-2.6.1