Decouple DateHelper methods, remove state