class methods
token list
clean up