Remove Optional class in favor of java.util.Optional

When using Java streams dealing with two different Optional classes becomes confusing otherwise.