TODO for removal of javax.time