Remove fish and add headings