Removed auto Date extraction