diff --git a/protos/voltha_protos/device.proto b/protos/voltha_protos/device.proto
index 0baf1bc..1245e58 100644
--- a/protos/voltha_protos/device.proto
+++ b/protos/voltha_protos/device.proto
@@ -101,6 +101,7 @@
     repeated Image image = 1;
 }
 
+//TODO: ImageDownload is not actively used (05/19/2020).  When this is tackled, can remove extra/unnecessary fields.
 message ImageDownload {
     enum ImageDownloadState {
         DOWNLOAD_UNKNOWN = 0;
@@ -166,7 +167,7 @@
 
     // Image activation state
     ImageActivateState image_state = 12;
-    
+
     // Image file size
     uint32 file_size = 13;
 }
@@ -296,9 +297,6 @@
     // Device type specific attributes
     google.protobuf.Any custom = 64;
 
-    repeated Port ports = 128  [(child_node) = {key: "port_no"}];
-    openflow_13.Flows flows = 129 [(child_node) = {}];
-    openflow_13.FlowGroups flow_groups = 130 [(child_node) = {}];
     // PmConfigs will eventually converted to a child node of the
     // device to falicitata callbacks and to simplify manipulation.
     PmConfigs pm_configs = 131 [(child_node) = {}];