Update Java version on Windows;
Clean up some debugging code;