Hi, Please review this patch that removes the WaterMark class. Bug: https://bugs.openjdk.java.net/browse/JDK-8139506 Webrev: http://cr.openjdk.java.net/~david/JDK-8139506/webrev.00/ Testing: Passed JPRT. Thanks, David