diff --git a/device-types/Juniper/QFX5100-48S-6Q.yaml b/device-types/Juniper/QFX5100-48S-6Q.yaml
index 4c3d2a67d..46682459d 100644
--- a/device-types/Juniper/QFX5100-48S-6Q.yaml
+++ b/device-types/Juniper/QFX5100-48S-6Q.yaml
@@ -5,534 +5,320 @@ slug: qfx5100-48s-6q
 part_number: QFX5100-48S-6Q
 u_height: 1
 is_full_depth: true
-subdevice_role: ''
-comments: ''
 console-ports:
   - name: console
     type: rj-45
-    label: ''
-    description: ''
 power-ports:
   - name: power-0
     type: iec-60320-c14
     maximum_draw: 650
-    allocated_draw: null
-    label: ''
-    description: ''
   - name: power-1
     type: iec-60320-c14
     maximum_draw: 650
-    allocated_draw: null
-    label: ''
-    description: ''
 interfaces:
   - name: et-0/0/48
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: et-0/0/49
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: et-0/0/50
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: et-0/0/51
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: et-0/0/52
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: et-0/0/53
     type: 40gbase-x-qsfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/0
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/1
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/2
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/3
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/4
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/5
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/6
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/7
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/8
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/9
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/10
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/11
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/12
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/13
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/14
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/15
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/16
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/17
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/18
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/19
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/20
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/21
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/22
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/23
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/24
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/25
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/26
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/27
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/28
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/29
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/30
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/31
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/32
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/33
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/34
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/35
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/36
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/37
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/38
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/39
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/40
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/41
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/42
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/43
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/44
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/45
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/46
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: ge-0/0/47
     type: 1000base-x-sfp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/0
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/1
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/2
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/3
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/4
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/5
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/6
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/7
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/8
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/9
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/10
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/11
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/12
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/13
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/14
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/15
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/16
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/17
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/18
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/19
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/20
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/21
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/22
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/23
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/24
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/25
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/26
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/27
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/28
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/29
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/30
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/31
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/32
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/33
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/34
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/35
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/36
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/37
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/38
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/39
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/40
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/41
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/42
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/43
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/44
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/45
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/46
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''
   - name: xe-0/0/47
     type: 10gbase-x-sfpp
     mgmt_only: false
-    label: ''
-    description: ''