diff --git a/definitions/variable/variable.yaml b/definitions/variable/variable.yaml
index 5ae06c1..914e442 100644
--- a/definitions/variable/variable.yaml
+++ b/definitions/variable/variable.yaml
@@ -975,99 +975,6 @@
 - Capacity|Electricity|Storage:
     definition: Total installed (available) capacity of operating electricity storage
     unit: GW
-- Capacity|Gases|Biomass:
-    definition: Total installed (available) capacity of biomass to gas plants.
-    unit: GW
-- Capacity|Gases|Biomass|w/ CCS:
-    definition: Total installed (available) capacity of biomass to gas plants with
-      CCS.
-    unit: GW
-- Capacity|Gases|Biomass|w/o CCS:
-    definition: Total installed (available) capacity of biomass to gas plants without
-      CCS.
-    unit: GW
-- Capacity|Gases|Coal:
-    definition: Total installed (available) capacity of coal to gas plants.
-    unit: GW
-- Capacity|Gases|Coal|w/ CCS:
-    definition: Total installed (available) capacity of coal to gas plants with CCS.
-    unit: GW
-- Capacity|Gases|Coal|w/o CCS:
-    definition: Total installed (available) capacity of coal to gas plants without
-      CCS.
-    unit: GW
-- Capacity|Hydrogen|Biomass:
-    definition: Total installed (available) capacity of biomass to hydrogen plants.
-    unit: GW
-- Capacity|Hydrogen|Biomass|w/ CCS:
-    definition: Total installed (available) capacity of biomass to hydrogen plants
-      with CCS.
-    unit: GW
-- Capacity|Hydrogen|Biomass|w/o CCS:
-    definition: Total installed (available) capacity of biomass to hydrogen plants
-      without CCS.
-    unit: GW
-- Capacity|Hydrogen|Coal:
-    definition: Total installed (available) capacity of coal to hydrogen plants.
-    unit: GW
-- Capacity|Hydrogen|Coal|w/ CCS:
-    definition: Total installed (available) capacity of coal to hydrogen plants with
-      CCS.
-    unit: GW
-- Capacity|Hydrogen|Coal|w/o CCS:
-    definition: Total installed (available) capacity of coal to hydrogen plants without
-      CCS.
-    unit: GW
-- Capacity|Hydrogen|Electricity:
-    definition: Total installed (available) capacity of hydrogen-by-electrolysis plants.
-    unit: GW
-- Capacity|Hydrogen|Gas:
-    definition: Total installed (available) capacity of gas to hydrogen plants.
-    unit: GW
-- Capacity|Hydrogen|Gas|w/ CCS:
-    definition: Total installed (available) capacity of gas to hydrogen plants with
-      CCS.
-    unit: GW
-- Capacity|Hydrogen|Gas|w/o CCS:
-    definition: Total installed (available) capacity of gas to hydrogen plants without
-      CCS.
-    unit: GW
-- Capacity|Liquids|Biomass:
-    definition: Total installed (available) capacity of biomass to liquids plants.
-    unit: GW
-- Capacity|Liquids|Biomass|w/ CCS:
-    definition: Total installed (available) capacity of biomass to liquids plants
-      with CCS.
-    unit: GW
-- Capacity|Liquids|Biomass|w/o CCS:
-    definition: Total installed (available) capacity of biomass to liquids plants
-      without CCS.
-    unit: GW
-- Capacity|Liquids|Coal:
-    definition: Total installed (available) capacity of coal to liquids plants.
-    unit: GW
-- Capacity|Liquids|Coal|w/ CCS:
-    definition: Total installed (available) capacity of coal to liquids plants with
-      CCS.
-    unit: GW
-- Capacity|Liquids|Coal|w/o CCS:
-    definition: Total installed (available) capacity of coal to liquids plants without
-      CCS.
-    unit: GW
-- Capacity|Liquids|Gas:
-    definition: Total installed (available) capacity of gas to liquids plants.
-    unit: GW
-- Capacity|Liquids|Gas|w/ CCS:
-    definition: Total installed (available) capacity of gas to liquids plants with
-      CCS.
-    unit: GW
-- Capacity|Liquids|Gas|w/o CCS:
-    definition: Total installed (available) capacity of gas to liquids plants without
-      CCS.
-    unit: GW
-- Capacity|Liquids|Oil:
-    definition: Total installed (available) capacity of oil refining plants.
-    unit: GW
 - Cumulative Capacity|Electricity|Biomass:
     definition: Cumulative installed capacity (since 2005) of biomass power plants.
     unit: GW
@@ -2328,10 +2235,6 @@
 - Investment|Energy Supply|Extraction|Bioenergy:
     definition: investments for extraction and production of bioenergy
     unit: billion USD_2010/yr
-- Investment|Energy Supply|Extraction|Uranium:
-    definition: investments for extraction and conversion of uranium. These should
-      include mining, conversion and enrichment
-    unit: billion USD_2010/yr
 - Investment|Energy Supply|Electricity|Fossil:
     definition: investments in new power generation for the specified power plant
       category. If the model features several sub-categories, the total investments
@@ -2471,37 +2374,6 @@
     definition: investments in electricity storage technologies (e.g., batteries,
       compressed air storage reservoirs, etc.)
     unit: billion USD_2010/yr
-- Investment|Energy Supply|Hydrogen|Fossil:
-    definition: investments for the production of hydrogen from the specified source.
-      For plants equipped with CCS, the investment in the capturing equipment should
-      be included but not the one on transport and storage.
-    unit: billion USD_2010/yr
-- Investment|Energy Supply|Hydrogen|Renewable:
-    definition: investments for the production of hydrogen from the specified source.
-      For plants equipped with CCS, the investment in the capturing equipment should
-      be included but not the one on transport and storage.
-    unit: billion USD_2010/yr
-- Investment|Energy Supply|Hydrogen|Other:
-    definition: investments for the production of hydrogen from the specified source.
-      For plants equipped with CCS, the investment in the capturing equipment should
-      be included but not the one on transport and storage.
-    unit: billion USD_2010/yr
-- Investment|Energy Supply|Liquids|Oil:
-    definition: investments for the production of fossil fuels from oil refineries
-      For plants equipped with CCS, the investment in the capturing equipment should
-      be included but not the one on transport and storage.
-    unit: billion USD_2010/yr
-- Investment|Energy Supply|Liquids|Coal and Gas:
-    definition: investments for the production of fossil-based synfuels (coal and
-      gas). For plants equipped with CCS, the investment in the capturing equipment
-      should be included but not the one on transport and storage.
-    unit: billion USD_2010/yr
-- Investment|Energy Supply|Liquids|Biomass:
-    definition: investments for the production of biofuels. These should not include
-      the costs of the feedstock. For plants equipped with CCS, the investment in
-      the capturing equipment should be included but not the one on transport and
-      storage.
-    unit: billion USD_2010/yr
 - Investment|Energy Supply|CO2 Transport and Storage:
     definition: investment in CO2 transport and storage (note that investment in the
       capturing equipment should be included along with the power plant technology)