cleanup
more on tokenized header