DNS API clean up