AzureRT PR S38

Also, remove this part.