another round of strtok removals