some API clean up