More API clean up.