SOAP-348: minor cleanup