Clean up tokens sanity checks