Skip to content

Remove JDK-Optional usage where not useful