extra string comparison removed