removed unused strings and warning