[#95] Clean up old strings