Stop using hardcoded date