SOAP-769 Remove debug code