-raw-token now checks for /dev/urandom and /dev/arandom rather than just /dev/urandom
-removed unused `token` slot from the model