Remove security dependency to prevent circular dependencies