Cleanup docs, remove unused method.
Fix imports.