another round of strtok removal