Removed generic-soap