fixup! remove redundant string joins