update joda-time + cleanup