API clean-up