remove dependency to security-server