For another cleanup, but these shouldn't need to be quoted