korrections, and removed unused string