Get rid of the SubTok trait