Reviewed IaC cleanup MR from Sansar