diff --git a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
index 431de7e9e..6521a1ddb 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
@@ -85,13 +85,11 @@
 	<channel-type id="textualstate">
 		<item-type>String</item-type>
 		<label>Textual State</label>
-		<description></description>
 		<state readOnly="true"/>
 	</channel-type>
 	<channel-type id="mowed">
 		<item-type>Dimmer</item-type>
 		<label>Cut Grass</label>
-		<description></description>
 		<state readOnly="true" pattern="%d %%"></state>
 	</channel-type>
 	<channel-type id="ready">
diff --git a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/bridge.xml
index 4403ca535..2bf83c7c8 100644
--- a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/bridge.xml
@@ -17,7 +17,6 @@
 			<parameter-group name="port">
 				<context>communication</context>
 				<label>Port Configuration</label>
-				<description></description>
 			</parameter-group>
 
 			<parameter name="port" type="text" required="true" groupName="port">
diff --git a/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/thing/thing-types.xml
index 19c5612c2..d065754d4 100644
--- a/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.folding/src/main/resources/OH-INF/thing/thing-types.xml
@@ -22,7 +22,6 @@
 			</parameter>
 			<parameter name="port" type="integer">
 				<label>Port</label>
-				<description></description>
 				<default>36330</default>
 			</parameter>
 			<parameter name="password" type="text">
diff --git a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
index 8292a30a2..393753736 100644
--- a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/channels.xml
@@ -30,7 +30,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -65,7 +64,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="inverted" type="boolean" required="false">
 				<label>Inverted Signal</label>
@@ -81,7 +79,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -111,7 +108,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -146,7 +142,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -176,7 +171,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -206,7 +200,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="direction" type="text" required="false">
 				<label>Channel Direction</label>
@@ -278,7 +271,6 @@
 		<config-description>
 			<parameter name="resourceId" type="integer" required="true">
 				<label>Resource Id</label>
-				<description></description>
 			</parameter>
 			<parameter name="longPressTime" type="integer" required="true" step="1000" min="0" max="5000" unit="ms">
 				<label>Long Press Time</label>
diff --git a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/controller.xml b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/controller.xml
index 74793ac6c..46610894f 100644
--- a/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/controller.xml
+++ b/bundles/org.openhab.binding.ihc/src/main/resources/OH-INF/thing/controller.xml
@@ -7,7 +7,6 @@
 		extensible="switch, contact, number, dimmer, datetime, string, rollershutter, rf-device-low-battery, rf-device-signal-strength, push-button-trigger">
 
 		<label>IHC / ELKO Controller</label>
-		<description></description>
 
 		<channels>
 			<channel typeId="controller-state" id="controllerState"/>
diff --git a/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/thing/channels.xml
index 3df9a8394..405493172 100644
--- a/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.mqtt.generic/src/main/resources/OH-INF/thing/channels.xml
@@ -65,28 +65,24 @@
 	<channel-type id="colorRGB">
 		<item-type>Color</item-type>
 		<label>Color Value (Red,Green,Blue)</label>
-		<description></description>
 		<config-description-ref uri="thing-type:mqtt:color_channel"></config-description-ref>
 	</channel-type>
 
 	<channel-type id="colorHSB">
 		<item-type>Color</item-type>
 		<label>Color Value (Hue,Saturation,Brightness)</label>
-		<description></description>
 		<config-description-ref uri="thing-type:mqtt:color_channel"></config-description-ref>
 	</channel-type>
 
 	<channel-type id="color">
 		<item-type>Color</item-type>
 		<label>Color Value (HSB, RGB or CIE xyY)</label>
-		<description></description>
 		<config-description-ref uri="thing-type:mqtt:color_channel"></config-description-ref>
 	</channel-type>
 
 	<channel-type id="trigger">
 		<kind>trigger</kind>
 		<label>Trigger</label>
-		<description></description>
 		<config-description-ref uri="thing-type:mqtt:trigger_channel"></config-description-ref>
 	</channel-type>
 
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/SMO40.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/SMO40.xml
index 7d7baed05..3d471b9df 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/SMO40.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/SMO40.xml
@@ -6,7 +6,6 @@
 
 	<thing-type id="smo40-udp">
 		<label>UDP Connected Nibe SMO40 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="smo40-sensor-group-channels" id="sensor"/>
@@ -67,7 +66,6 @@
 
 	<thing-type id="smo40-serial">
 		<label>Serial Port Connected SMO40 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="smo40-sensor-group-channels" id="sensor"/>
@@ -127,7 +125,6 @@
 
 	<thing-type id="smo40-simulator">
 		<label>Simulator for Nibe SMO40 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="smo40-sensor-group-channels" id="sensor"/>
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45.xml
index a68cfaffb..68d005bd8 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45.xml
@@ -6,7 +6,6 @@
 
 	<thing-type id="f1x45-udp">
 		<label>UDP Connected Nibe F1145 and F1245 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x45-sensor-group-channels" id="sensor"/>
@@ -67,7 +66,6 @@
 
 	<thing-type id="f1x45-serial">
 		<label>Serial Port Connected F1145 and F1245 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x45-sensor-group-channels" id="sensor"/>
@@ -127,7 +125,6 @@
 
 	<thing-type id="f1x45-simulator">
 		<label>Simulator for Nibe F1145 and F1245 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x45-sensor-group-channels" id="sensor"/>
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x55.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x55.xml
index 1afdb4d72..d8c9a4b56 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x55.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x55.xml
@@ -6,7 +6,6 @@
 
 	<thing-type id="f1x55-udp">
 		<label>UDP Connected Nibe F1155 and F1255 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x55-sensor-group-channels" id="sensor"/>
@@ -67,7 +66,6 @@
 
 	<thing-type id="f1x55-serial">
 		<label>Serial Port Connected F1155 and F1255 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x55-sensor-group-channels" id="sensor"/>
@@ -127,7 +125,6 @@
 
 	<thing-type id="f1x55-simulator">
 		<label>Simulator for Nibe F1155 and F1255 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f1x55-sensor-group-channels" id="sensor"/>
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f470.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f470.xml
index 028907061..1307eb649 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f470.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f470.xml
@@ -6,7 +6,6 @@
 
 	<thing-type id="f470-udp">
 		<label>UDP Connected Nibe F470 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f470-sensor-group-channels" id="sensor"/>
@@ -67,7 +66,6 @@
 
 	<thing-type id="f470-serial">
 		<label>Serial Port Connected F470 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f470-sensor-group-channels" id="sensor"/>
@@ -127,7 +125,6 @@
 
 	<thing-type id="f470-simulator">
 		<label>Simulator for Nibe F470 Heat Pumps</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f470-sensor-group-channels" id="sensor"/>
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f750.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f750.xml
index 68a8bc0b8..8f5823028 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f750.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f750.xml
@@ -6,7 +6,6 @@
 
 	<thing-type id="f750-udp">
 		<label>UDP Connected Nibe F750 Heat Pump</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f750-sensor-group-channels" id="sensor"/>
@@ -67,7 +66,6 @@
 
 	<thing-type id="f750-serial">
 		<label>Serial Port Connected F750 Heat Pump</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f750-sensor-group-channels" id="sensor"/>
@@ -127,7 +125,6 @@
 
 	<thing-type id="f750-simulator">
 		<label>Simulator for Nibe F750 Heat Pump</label>
-		<description></description>
 
 		<channel-groups>
 			<channel-group typeId="f750-sensor-group-channels" id="sensor"/>
diff --git a/bundles/org.openhab.binding.satel/src/main/resources/OH-INF/thing/partition.xml b/bundles/org.openhab.binding.satel/src/main/resources/OH-INF/thing/partition.xml
index b8d1262bb..1115086e0 100644
--- a/bundles/org.openhab.binding.satel/src/main/resources/OH-INF/thing/partition.xml
+++ b/bundles/org.openhab.binding.satel/src/main/resources/OH-INF/thing/partition.xml
@@ -41,7 +41,6 @@ access to some portion of the premises to selected users.]]>
 		<config-description>
 			<parameter name="id" type="integer" min="1" max="32" required="true">
 				<label>Partition Number</label>
-				<description></description>
 			</parameter>
 			<parameter name="forceArming" type="boolean" required="false">
 				<label>Force Arming</label>
diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
index 9e33f9f68..6f3e069c3 100644
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/thing/relay.xml
@@ -527,7 +527,6 @@
 	<channel-type id="meterPowerFactor">
 		<item-type>Number</item-type>
 		<label>Power Factor</label>
-		<description></description>
 		<state readOnly="true" pattern="%.2f %unit%">
 		</state>
 	</channel-type>
diff --git a/bundles/org.openhab.binding.spotify/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.spotify/src/main/resources/OH-INF/thing/thing-types.xml
index b591562ad..ad073b4c4 100644
--- a/bundles/org.openhab.binding.spotify/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.spotify/src/main/resources/OH-INF/thing/thing-types.xml
@@ -194,7 +194,6 @@
 	<channel-type id="currentlyPlayedTrackHref" advanced="true">
 		<item-type>String</item-type>
 		<label>Track URL</label>
-		<description></description>
 		<state readOnly="true"/>
 	</channel-type>
 	<channel-type id="currentlyPlayedTrackUri" advanced="true">
diff --git a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/thing/thing-types.xml
index b02757354..baf27d57d 100644
--- a/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.venstarthermostat/src/main/resources/OH-INF/thing/thing-types.xml
@@ -93,12 +93,10 @@
 		<config-description>
 			<parameter name="username" type="text" required="true">
 				<label>Username</label>
-				<description></description>
 			</parameter>
 			<parameter name="password" type="text" required="true">
 				<label>Password</label>
 				<context>password</context>
-				<description></description>
 			</parameter>
 			<parameter name="url" type="text" required="true">
 				<label>URL</label>