Remove more unnecessary stuff in Token class