remove SOAP Gateway
Merge branch 'remove_SOAP' into develop