Fix warnings, replace unnecessary util methods with Guava Joiner/Splitter, remove old TT references.