Remove old ToString code