API clean up