API clean-up.