Minor optimization of string concats and removed an unused function.