Removed unused strings & fix #6