clean up API classes