Got rid of tokeninput