Removing legacy variable substitution $var and replacing with {{}} due to deprecation