WSDL cleanups (cont)