Changed some string values; removed useless ones