If joda-time is not used, it can be removed here as well