===> Cleaning for fish-3.5.1