delete unnecessary
Added token support