Fix extended_date for new tokens
remove some methods, and start to create date tokens