Remove references to Optional and LocalDateTime