removed substring calls