https://bugs.openjdk.java.net/browse/JDK-8137059 http://cr.openjdk.java.net/~prr/8137059/ This is a follow-up to https://bugs.openjdk.java.net/browse/JDK-8136783 This new change cleans up the demos and one additional JDK source file. -phil.