Remove SecuritySystem API
Merge remote-tracking branch 'dmlloyd/remove-sec-sys'