Fix OptionalResult class from always returning Optional.empty (or null)
Remove logging.