Merge "Remove unneeded quoting"