Fix haddock build errors

Fix errors in haddock comments so that documentation can be built. Remove unused import.