Small string changes + removed obsolete code
Removed unused strings