fish: misc cleanup