removing Date and Calendar representations, using java.time.Instant everywhere