Clean-up after service creation errors

[#82739874]
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.