haddock cleanup