SOAP-1021: Removed ununsed class