Removed Token.create_and_serialize
More refactoring