DateUtils refactor to use Apache DateUtils. Joda time removed.