===> Cleaning for fish-4.7.1