Remove JDK-Optional usage where not useful