Revert "cleanups"

This reverts commit 4de6d21c8588e0ec3b623f988fffd507654aaca5.
envoyd: use strcspn in line parsing