Remove old deps
Refactor to use `strchr`