Revert "Use Secure instead of System - Lines 216 & 507"