Remove joda library
Rename