Clean up very old string concatination