Fix broken str_remove
Update token interface (new specification)