removed joda time dependency