remove TokenT class
refactored