Cleanup of duplicate documentation and api