removed unneeded startsWith