Remove SOAP code