Merge "Remove RSM from deployment"