clean up token getting