Clean up strings

Clean up old dead code.