Clean up haddocks and API