haddock cleanup.