final cleanup
diff --git a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGWDevice.java b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGWDevice.java
index ddd5b1d..786fd59 100644
--- a/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGWDevice.java
+++ b/connectors/iotp/src/main/java/org/apache/edgent/connectors/iotp/IotpGWDevice.java
@@ -31,7 +31,15 @@
 
 import com.google.gson.JsonObject;
 
-class IotpGWDevice implements IotDevice {  // TODO implements IotpDevice ??? does GW allow for http?
+/**
+ * An IotDevice connected to WIoTP via a Gateway device.
+ * <P>
+ * This is a non-public part of the IotpGateway implementation.
+ * 
+ * @see IotpGateway#getIotDevice(java.util.Map)
+ * @see IotpGateway#getIotDevice(java.util.Map)
+ */
+class IotpGWDevice implements IotDevice {
   
   private final IotpGateway gateway;
   private final IotpGWConnector connector;
@@ -96,4 +104,4 @@
     return String.format("IotpGWDevice %s", fqDeviceId); 
   }
   
-}
\ No newline at end of file
+}
diff --git a/scripts/connectors/iotp/README b/scripts/connectors/iotp/README
index 0eaee83..eccb2f8 100644
--- a/scripts/connectors/iotp/README
+++ b/scripts/connectors/iotp/README
@@ -15,7 +15,7 @@
 # IotpSensors connects to your IBM Watson IoT Platform service
 # as the device defined in your device config file.
 #
-# A sample config file for your WIoTP registered device information 
+# A prototype config file for your WIoTP registered device information 
 # is provided in device.cfg.
 
 IotpSensors     - ./runiotsensors.sh device-cfg-path
@@ -27,7 +27,7 @@
 # Use IotpAppClient to print out the generated device events and
 # to generate the device commands.
 #
-# Sample config files for your WIoTP registered device, gateway,
+# Prototype config files for your WIoTP registered device, gateway,
 # and application client information are provided in
 # iotp-device-sample.cfg, iotp-gwdevice-sample.cfg and iotp-app-client.cfg
 
diff --git a/scripts/connectors/iotp/iotp-gwdevice-sample.cfg b/scripts/connectors/iotp/iotp-gwdevice-sample.cfg
index f1f4009..1845fcc 100644
--- a/scripts/connectors/iotp/iotp-gwdevice-sample.cfg
+++ b/scripts/connectors/iotp/iotp-gwdevice-sample.cfg
@@ -3,7 +3,7 @@
 [device]
 # WIoTP defined IoT Gateway device configuration properties
 
-Organization-ID = zr2b4z
+Organization-ID = 
 Gateway-Type = 
 Gateway-ID = 
 Authentication-Method = token