Remove concept of single use token