Remove joda time as a dependency (this will be implemented later)