Remove trace
Fix haddock parsing