SOAP-1976 Remove basic