JDK-8047724: cleanup since tags