removed token
simplified
s