Further API clean-up