WSDL cleanups