Remove security-server dependency