Security Updates

Updates for security vulnerabilities.
Removes guard component not being used