tokens removal is working