Remove generated date
Simplify date