Refactored accessing the SOAP client

Removed unused "delayed" code