Security API clean up