Index: extensions/dict_dcca_3gpp/add_avps.c
===================================================================
--- extensions/dict_dcca_3gpp/add_avps.c	(revision 1531)
+++ extensions/dict_dcca_3gpp/add_avps.c	(revision 1532)
@@ -436,5 +436,5 @@
 	/* for External-Identifier (3111).                                  */
 	/*                                                                  */
-	/* Change-1.4.0: Remove External-Identifier (28) OctetString.       */
+	/* Change-1.4.0: External-Identifier (28) OctetString removed.      */
 
 	/* TWAN-Identifier, OctetString, code 29, section 16.4.7            */
@@ -3366,17 +3366,5 @@
 	/*==================================================================*/
 
-	/* Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time (2801). */
-	/* ADC-Revalidation-Time, Time, code 2801, section 5.3.93           */
-	{
-		struct dict_avp_data data = {
-			2801,	/* Code */
-			10415,	/* Vendor */
-			"ADC-Revalidation-Time",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, Time_type, NULL);
-	};
+	/* Change-1.4.0: ADC-Revalidation-Time (2801) Time removed in 3GPP TS 29.212 V12.1.0 (2013-06). */
 
 	/* Note: Name conflict with 3GPP TS 32.299 3GPP-PS-Data-Off-Status (4406). */
@@ -3988,17 +3976,5 @@
 	};
 
-	/* Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN (2803). */
-	/* HeNB-BBF-FQDN, UTF8String, code 2803, section 5.3.94             */
-	{
-		struct dict_avp_data data = {
-			2803,	/* Code */
-			10415,	/* Vendor */
-			"HeNB-BBF-FQDN",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL);
-	};
+	/* Note: HeNB-BBF-FQDN (2803) UTF8String removed in 3GPP TS 29.212 V11.8.0 (2013-03). */
 
 	/* HeNB-Local-IP-Address, Address, code 2804, section 5.3.95        */
@@ -7199,20 +7175,5 @@
 	};
 
-	/* Note: 3GPP TS 29.229 V6.5.0 (2005-06) removed User-Data-Request-Type (627). */
-	/* User-Data-Request-Type, Enumerated, code 627, section 6.3.25     */
-	{
-		struct dict_avp_data data = {
-			627,	/* Code */
-			10415,	/* Vendor */
-			"User-Data-Request-Type",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_INTEGER32	/* base type of data */
-		};
-		struct dict_object	*type;
-		struct dict_type_data	 tdata = { AVP_TYPE_INTEGER32, "Enumerated(3GPP/User-Data-Request-Type)", NULL, NULL, NULL };
-		CHECK_dict_new(DICT_TYPE, &tdata, NULL, &type);
-		CHECK_dict_new(DICT_AVP, &data, type, NULL);
-	};
+	/* Note: User-Data-Request-Type (627) removed in 3GPP TS 29.229 V6.5.0 (2005-06). */
 
 	/* Supported-Features, Grouped, code 628, section 6.3.29            */
@@ -7786,7 +7747,5 @@
 	};
 
-	/* Note: APN-Id (308) OctetString only present from                 */
-	/* 3GPP TS 29.234 V6.2.0 (2005-03) to 3GPP TS 29.234 V6.4.0 (2005-09) */
-	/* before being deprecated in 3GPP TS 29.234 V6.5.0 (2005-12).      */
+	/* Note: APN-Id (308) OctetString removed in 3GPP TS 29.234 V6.5.0 (2005-12). */
 
 	/* APN-Barring-Type, Enumerated, code 309, section 10.1.16          */
@@ -9950,5 +9909,5 @@
 	/* Measurement-Period-LTE (1655) from 1656.                         */
 	/*                                                                  */
-	/* Change-1.4.0: Measurement-Period-LTE (1656) code changed from 1656. */
+	/* Change-1.4.0: Measurement-Period-LTE (1656) code changed to Measurement-Period-LTE (1655). */
 	/* Measurement-Period-LTE, Enumerated, code 1655, section 7.3.166   */
 	{
@@ -9970,5 +9929,5 @@
 	/* Measurement-Period-UMTS (1656) from 1655.                        */
 	/*                                                                  */
-	/* Change-1.4.0: Measurement-Period-UMTS (1656) code changed from 1655. */
+	/* Change-1.4.0: Measurement-Period-UMTS (1655) code changed to Measurement-Period-UMTS (1656). */
 	/* Measurement-Period-UMTS, Enumerated, code 1656, section 7.3.167  */
 	{
@@ -11195,6 +11154,5 @@
 	};
 
-	/* Note: Trust-Relationship-Update (1515) Enumerated only present   */
-	/* in 3GPP TS 29.273 V11.3.0 (2012-09) before being deprecated.     */
+	/* Note: Trust-Relationship-Update (1515) Enumerated removed in 3GPP TS 29.273 V11.4.0 (2012-12). */
 
 	/* DER-S6b-Flags, Unsigned32, code 1523, section 9.2.3.7            */
@@ -18677,31 +18635,7 @@
 	};
 
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Address (895). */
-	/* PDG-Address, Address, code 895                                   */
-	{
-		struct dict_avp_data data = {
-			895,	/* Code */
-			10415,	/* Vendor */
-			"PDG-Address",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, Address_type, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Charging-Id (896). */
-	/* PDG-Charging-Id, Unsigned32, code 896                            */
-	{
-		struct dict_avp_data data = {
-			896,	/* Code */
-			10415,	/* Vendor */
-			"PDG-Charging-Id",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_UNSIGNED32	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-	};
+	/* Change-1.4.0: PDG-Address (895) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: PDG-Charging-Id (896) Unsigned32 removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
 
 	/* Play-Alternative, Enumerated, code 3913                          */
@@ -21252,45 +21186,9 @@
 	};
 
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-Address (890). */
-	/* WAG-Address, Address, code 890                                   */
-	{
-		struct dict_avp_data data = {
-			890,	/* Code */
-			10415,	/* Vendor */
-			"WAG-Address",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, Address_type, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-PLMN-Id (891). */
-	/* WAG-PLMN-Id, OctetString, code 891                               */
-	{
-		struct dict_avp_data data = {
-			891,	/* Code */
-			10415,	/* Vendor */
-			"WAG-PLMN-Id",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Information (875). */
-	/* WLAN-Information, Grouped, code 875                              */
-	{
-		struct dict_avp_data data = {
-			875,	/* Code */
-			10415,	/* Vendor */
-			"WLAN-Information",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_GROUPED	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-	};
+	/* Change-1.4.0: WAG-Address (890) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: WAG-PLMN-Id (891) OctetString removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: WLAN-Information (875) Grouped removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
 
 	/* WLAN-Operator-Id, Grouped, code 1306                             */
@@ -21333,59 +21231,11 @@
 	};
 
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Radio-Container (892). */
-	/* WLAN-Radio-Container, Grouped, code 892                          */
-	{
-		struct dict_avp_data data = {
-			892,	/* Code */
-			10415,	/* Vendor */
-			"WLAN-Radio-Container",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_GROUPED	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Session-Id (1246). */
-	/* WLAN-Session-Id, UTF8String, code 1246                           */
-	{
-		struct dict_avp_data data = {
-			1246,	/* Code */
-			10415,	/* Vendor */
-			"WLAN-Session-Id",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, UTF8String_type, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Technology (893). */
-	/* WLAN-Technology, Unsigned32, code 893                            */
-	{
-		struct dict_avp_data data = {
-			893,	/* Code */
-			10415,	/* Vendor */
-			"WLAN-Technology",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_UNSIGNED32	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, NULL, NULL);
-	};
-
-	/* Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-UE-Local-IPAddress (894). */
-	/* WLAN-UE-Local-IPAddress, Address, code 894                       */
-	{
-		struct dict_avp_data data = {
-			894,	/* Code */
-			10415,	/* Vendor */
-			"WLAN-UE-Local-IPAddress",	/* Name */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flags */
-			AVP_FLAG_VENDOR |AVP_FLAG_MANDATORY,	/* Fixed flag values */
-			AVP_TYPE_OCTETSTRING	/* base type of data */
-		};
-		CHECK_dict_new(DICT_AVP, &data, Address_type, NULL);
-	};
+	/* Change-1.4.0: WLAN-Radio-Container (892) Grouped removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: WLAN-Session-Id (1246) UTF8String removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: WLAN-Technology (893) Unsigned32 removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
+
+	/* Change-1.4.0: WLAN-UE-Local-IPAddress (894) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09). */
 
 	/*==================================================================*/
Index: extensions/dict_dcca_3gpp/dict_dcca_3gpp.c
===================================================================
--- extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	(revision 1499)
+++ extensions/dict_dcca_3gpp/dict_dcca_3gpp.c	(revision 1532)
@@ -836,5 +836,4 @@
 				{ { .avp_vendor = 10415, .avp_name = "AoC-Information" }, RULE_OPTIONAL, -1, 1 },
 				{ { .avp_vendor = 10415, .avp_name = "PS-Information" }, RULE_OPTIONAL, -1, 1 },
-				{ { .avp_vendor = 10415, .avp_name = "WLAN-Information" }, RULE_OPTIONAL, -1, 1 },
 				{ { .avp_vendor = 10415, .avp_name = "IMS-Information" }, RULE_OPTIONAL, -1, 1 },
 				{ { .avp_vendor = 10415, .avp_name = "MMS-Information" }, RULE_OPTIONAL, -1, 1 },
Index: extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv
===================================================================
--- extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1531)
+++ extensions/dict_dcca_3gpp/dict_dcca_3gpp.csv	(revision 1532)
@@ -90,5 +90,5 @@
 # for External-Identifier (3111).,,,,,,,
 # ,,,,,,,
-# Change-1.4.0: Remove External-Identifier (28) OctetString.,,,,,,,
+# Change-1.4.0: External-Identifier (28) OctetString removed.,,,,,,,
 #,,,,,,,
 TWAN-Identifier,29,16.4.7,OctetString,V,P,,M
@@ -505,6 +505,6 @@
 #=,,,,,,,
 #,,,,,,,
-# Note: 3GPP TS 29.212 V12.1.0 (2013-06) removed ADC-Revalidation-Time (2801).,,,,,,,
-ADC-Revalidation-Time,2801,5.3.93,Time,V,P,,M
+# Change-1.4.0: ADC-Revalidation-Time (2801) Time removed in 3GPP TS 29.212 V12.1.0 (2013-06).,,,,,,,
+#,,,,,,,
 # Note: Name conflict with 3GPP TS 32.299 3GPP-PS-Data-Off-Status (4406).,,,,,,,
 # 3GPP TS 29.212 V14.3.0 (2017-03) CR 1559 added 3GPP-PS-Data-Off-Status (2847).,,,,,,,
@@ -554,6 +554,6 @@
 Guaranteed-Bitrate-DL,1025,5.3.25,Unsigned32,"M,V",P,,
 Guaranteed-Bitrate-UL,1026,5.3.26,Unsigned32,"M,V",P,,
-# Note: 3GPP TS 29.212 V11.8.0 (2013-03) removed HeNB-BBF-FQDN (2803).,,,,,,,
-HeNB-BBF-FQDN,2803,5.3.94,UTF8String,V,P,,M
+# Note: HeNB-BBF-FQDN (2803) UTF8String removed in 3GPP TS 29.212 V11.8.0 (2013-03).,,,,,,,
+#,,,,,,,
 HeNB-Local-IP-Address,2804,5.3.95,Address,V,P,,M
 IP-CAN-Session-Charging-Scope,2827,5.3.114,Enumerated,V,P,,M
@@ -910,6 +910,6 @@
 Confidentiality-Key,625,6.3.27,OctetString,"M, V",,,
 Integrity-Key,626,6.3.28,OctetString,"M, V",,,
-# Note: 3GPP TS 29.229 V6.5.0 (2005-06) removed User-Data-Request-Type (627).,,,,,,,
-User-Data-Request-Type,627,6.3.25,Enumerated,"M, V",,,
+# Note: User-Data-Request-Type (627) removed in 3GPP TS 29.229 V6.5.0 (2005-06).,,,,,,,
+#,,,,,,,
 Supported-Features,628,6.3.29,Grouped,V,M,,
 Feature-List-ID,629,6.3.30,Unsigned32,V,,,M
@@ -968,7 +968,5 @@
 WLAN-3GPP-IP-Access,306,10.1.12,Enumerated,"M, V",,,
 APN-Authorized,307,10.1.14,Grouped,"M, V",,,
-# Note: APN-Id (308) OctetString only present from,,,,,,,
-# 3GPP TS 29.234 V6.2.0 (2005-03) to 3GPP TS 29.234 V6.4.0 (2005-09),,,,,,,
-# before being deprecated in 3GPP TS 29.234 V6.5.0 (2005-12).,,,,,,,
+# Note: APN-Id (308) OctetString removed in 3GPP TS 29.234 V6.5.0 (2005-12).,,,,,,,
 #,,,,,,,
 APN-Barring-Type,309,10.1.16,Enumerated,"M, V",,,
@@ -1160,10 +1158,10 @@
 # Measurement-Period-LTE (1655) from 1656.,,,,,,,
 # ,,,,,,,
-# Change-1.4.0: Measurement-Period-LTE (1656) code changed from 1656.,,,,,,,
+# Change-1.4.0: Measurement-Period-LTE (1656) code changed to Measurement-Period-LTE (1655).,,,,,,,
 Measurement-Period-LTE,1655,7.3.166,Enumerated,V,,,M
 # Note: 3GPP TS 29.272 V12.9.0 (2015-12) changed AVP code of,,,,,,,
 # Measurement-Period-UMTS (1656) from 1655.,,,,,,,
 # ,,,,,,,
-# Change-1.4.0: Measurement-Period-UMTS (1656) code changed from 1655.,,,,,,,
+# Change-1.4.0: Measurement-Period-UMTS (1655) code changed to Measurement-Period-UMTS (1656).,,,,,,,
 Measurement-Period-UMTS,1656,7.3.167,Enumerated,V,,,M
 Collection-Period-RRM-LTE,1657,7.3.168,Enumerated,V,,,M
@@ -1306,6 +1304,5 @@
 #,,,,,,,
 RAR-Flags,1522,9.2.3.1.5,Unsigned32,V,,,"M,P"
-# Note: Trust-Relationship-Update (1515) Enumerated only present,,,,,,,
-# in 3GPP TS 29.273 V11.3.0 (2012-09) before being deprecated.,,,,,,,
+# Note: Trust-Relationship-Update (1515) Enumerated removed in 3GPP TS 29.273 V11.4.0 (2012-12).,,,,,,,
 #,,,,,,,
 DER-S6b-Flags,1523,9.2.3.7,Unsigned32,V,,,"M,P"
@@ -2153,8 +2150,8 @@
 PDP-Address-Prefix-Length,2606,,Unsigned32,"V,M",,,
 PDP-Context-Type,1247,,Enumerated,"V,M",,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Address (895).,,,,,,,
-PDG-Address,895,,Address,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed PDG-Charging-Id (896).,,,,,,,
-PDG-Charging-Id,896,,Unsigned32,"M,V",P,,
+# Change-1.4.0: PDG-Address (895) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: PDG-Charging-Id (896) Unsigned32 removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
 Play-Alternative,3913,,Enumerated,"V,M",,,
 PoC-Change-Condition,1261,,Enumerated,"V,M",,,
@@ -2358,21 +2355,21 @@
 VLR-Number,3420,,OctetString,"V,M",,,
 Volume-Quota-Threshold,869,,Unsigned32,"V,M",,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-Address (890).,,,,,,,
-WAG-Address,890,,Address,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WAG-PLMN-Id (891).,,,,,,,
-WAG-PLMN-Id,891,,OctetString,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Information (875).,,,,,,,
-WLAN-Information,875,,Grouped,"M,V",P,,
+# Change-1.4.0: WAG-Address (890) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: WAG-PLMN-Id (891) OctetString removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: WLAN-Information (875) Grouped removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
 WLAN-Operator-Id,1306,,Grouped,V,,,M
 WLAN-Operator-Name,1307,,UTF8String,V,,,M
 WLAN-PLMN-Id,1308,,UTF8String,V,,,M
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Radio-Container (892).,,,,,,,
-WLAN-Radio-Container,892,,Grouped,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Session-Id (1246).,,,,,,,
-WLAN-Session-Id,1246,,UTF8String,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-Technology (893).,,,,,,,
-WLAN-Technology,893,,Unsigned32,"M,V",P,,
-# Note: 3GPP TS 32.299 V12.6.0 (2014-09) removed WLAN-UE-Local-IPAddress (894).,,,,,,,
-WLAN-UE-Local-IPAddress,894,,Address,"M,V",P,,
+# Change-1.4.0: WLAN-Radio-Container (892) Grouped removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: WLAN-Session-Id (1246) UTF8String removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: WLAN-Technology (893) Unsigned32 removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
+# Change-1.4.0: WLAN-UE-Local-IPAddress (894) Address removed in 3GPP TS 32.299 V12.6.0 (2014-09).,,,,,,,
+#,,,,,,,
 ,,,,,,,
 @standard,OMA DDS Charging Data,,,,,,
