Revert "track our own system/security"

This reverts commit b32cd25fbe38047e64fce675ec47807c952a991f.