===> Cleaning for fish-4.8.1