remove extra token condition