Updated feature #373: Removed system/security