Add and use cleanupText method