Replaced by CleanupString