Removed Date generation