changed inputs, rm'd token gen