Index: /trunk/resources/data/validator/combinations.mapcss
===================================================================
--- /trunk/resources/data/validator/combinations.mapcss	(revision 16092)
+++ /trunk/resources/data/validator/combinations.mapcss	(revision 16093)
@@ -112,9 +112,4 @@
 *[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/][parking!=yes][parking!=no],
 way[cutline                    ][man_made!=cutline],
-*[ref:FR:ARCEP                 ][telecom!=connection_point], 
-*[ref:FR:ARCEP                 ][telecom:medium!=fibre],
-*[ref:FR:Orange                ][telecom:medium!=fibre],
-*[ref:FR:SFR                   ][telecom:medium!=fibre],
-*[ref:FR:PTT                   ][telecom:medium!=copper],
 *[bunker_type                  ][military!=bunker] {
   throwWarning: tr("{0} without {1}", "{0.key}", "{1.tag}");
Index: /trunk/resources/data/validator/territories.mapcss
===================================================================
--- /trunk/resources/data/validator/territories.mapcss	(revision 16092)
+++ /trunk/resources/data/validator/territories.mapcss	(revision 16093)
@@ -1,10 +1,2 @@
-/* see ticket #12914 -- Discourage contributors to use operator=ERDF in France. */
-*[operator=ERDF][inside("FR")] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}");
-  suggestAlternative: "operator=Enedis";
-  group: tr("deprecated tagging");
-  fixAdd: "operator=Enedis";
-}
-
 /* #13932, #15283 */
 *[addr:street =~ /(?i).*Strasse.*/][addr:street !~ /(?i).*Strasser.*/][inside("DE,AT")],