Database API clean-up.