Removed dependency on web-security-bundle