Getting rid of token usage in devices (nw)