clean up main namespace
Merge branch 'api-cleanup'