Trying to remove JDK dependency