~ API clean-up