Remove startsWith and endsWith