diff --git a/definitions/variable/variable.yaml b/definitions/variable/variable.yaml
index 7185548..7ba7dc4 100644
--- a/definitions/variable/variable.yaml
+++ b/definitions/variable/variable.yaml
@@ -1,99 +1,3 @@
-- Agricultural Demand|Energy:
-    definition: agricultural demand level for all bioenergy (consumption, not production)
-    unit: million t DM/yr
-- Agricultural Demand|Energy|Crops:
-    definition: demand for modern primary energy crops (1st and 2nd generation)
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy:
-    definition: total demand for food, non-food and feed products (crops and livestock)
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Crops:
-    definition: total demand for food, non-food and feed products (crops)
-    unit: million t DM/yr
-- Agricultural Production|Energy:
-    definition: total bioenergy-related agricultural production (including waste and
-      residues)
-    unit: million t DM/yr
-- Agricultural Production|Energy|Crops:
-    definition: production for modern primary energy crops (1st and 2nd generation)
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy:
-    definition: total production for food, non-food and feed products (crops and livestock)
-    unit: million t DM/yr
-- Agricultural Demand|Energy|Crops|1st generation:
-    definition: demand for modern primary 1st generation energy crops
-    unit: million t DM/yr
-- Agricultural Demand|Energy|Crops|2nd generation:
-    definition: demand for modern primary 2nd generation energy crops
-    unit: million t DM/yr
-- Agricultural Demand|Energy|Residues:
-    definition: demand of agricultural residues for modern bioenergy production
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Crops|Feed:
-    definition: total demand for feed (crops)
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Crops|Food:
-    definition: total demand for food (crops)
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Crops|Other:
-    definition: total demand for non-food and non-feed (crops)
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Livestock:
-    definition: total demand for livestock products
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Livestock|Food:
-    definition: total demand for food livestock products
-    unit: million t DM/yr
-- Agricultural Demand|Non-Energy|Livestock|Other:
-    definition: total demand for non-food livestock products
-    unit: million t DM/yr
-- Agricultural Production|Energy|Crops|1st generation:
-    definition: production for modern primary 1st generation energy crops
-    unit: million t DM/yr
-- Agricultural Production|Energy|Crops|2nd generation:
-    definition: production for modern primary 2nd generation energy crops
-    unit: million t DM/yr
-- Agricultural Production|Energy|Residues:
-    definition: production of agricultural residues for modern bioenergy production
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Crops:
-    definition: total production for food, non-food and feed products (crops)
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Crops|Feed:
-    definition: total production for feed (crops)
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Crops|Food:
-    definition: total production for food (crops)
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Crops|Other:
-    definition: total production for non-food and non-feed (crops)
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Livestock:
-    definition: total production for livestock products
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Livestock|Food:
-    definition: total production for food livestock products
-    unit: million t DM/yr
-- Agricultural Production|Non-Energy|Livestock|Other:
-    definition: total production for non-food livestock products
-    unit: million t DM/yr
-- Fertilizer Use|Potassium:
-    definition: total potassium fertilizer use
-    unit: Tg K2O/yr
-- Yield|Cereal:
-    definition: yield of cereal production per until of area (used here as repreentative
-      crop to measure yield assumptions)
-    unit: t DM/ha/yr
-- Yield|Oilcrops:
-    definition: aggregated yield of Oilcrops (e.g. soybean, rapeseed, groundnut, sunflower,
-      oilpalm)
-    unit: t DM/ha/yr
-- Yield|Sugarcrops:
-    definition: aggregated yield of Sugarcrops (e.g. sugarbeet, sugarcane)
-    unit: t DM/ha/yr
-- Fertilizer|Potassium|Intensity:
-    definition: potassium fertilizer inputs in tonnes per hectare per year (or similar)
-    unit: t K20/ha/yr
 - Carbon Capture|Biomass:
     definition: total carbon dioxide emissions captured  from bioenergy use, should
       be reported as positive numbers
@@ -1893,294 +1797,6 @@
       macroeconomic development of the country are characterized with indicators, such
       as economic growth or the country's external debt position.
     unit: billion USD_2010/yr
-- Capital Cost|Electricity|Biomass|w/ CCS:
-    definition: Capital cost of a new biomass power plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Biomass|w/o CCS:
-    definition: Capital cost of a new biomass power plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Coal|w/ CCS:
-    definition: Capital cost of a new coal power plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Coal|w/o CCS:
-    definition: Capital cost of a new coal power plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Gas|w/ CCS:
-    definition: Capital cost of a new gas power plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Gas|w/o CCS:
-    definition: Capital cost of a new gas power plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Geothermal:
-    definition: Capital cost of a new geothermal power plant.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Hydro:
-    definition: Capital cost of a new hydropower plant.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Nuclear:
-    definition: Capital cost of a new nuclear power plants.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Solar|CSP:
-    definition: Capital cost of a new concentrated solar power plant.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Solar|PV:
-    definition: Capital cost of a new solar PV units.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Wind|Offshore:
-    definition: Capital cost of a new offshore wind power plants. This variable should
-      only be filled, if wind power is separated into onshore and offshore.
-    unit: USD_2010/kW
-- Capital Cost|Electricity|Wind|Onshore:
-    definition: Capital cost of a new onshore wind power plants. This variable should
-      only be filled, if wind power is separated into onshore and offshore.
-    unit: USD_2010/kW
-- Capital Cost|Gases|Biomass|w/ CCS:
-    definition: Capital cost of a new biomass to gas plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Gases|Biomass|w/o CCS:
-    definition: Capital cost of a new biomass to gas plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Gases|Coal|w/ CCS:
-    definition: Capital cost of a new coal to gas plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Gases|Coal|w/o CCS:
-    definition: Capital cost of a new coal to gas plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Biomass|w/ CCS:
-    definition: Capital cost of a new biomass to hydrogen plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Biomass|w/o CCS:
-    definition: Capital cost of a new biomass to hydrogen plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Coal|w/ CCS:
-    definition: Capital cost of a new coal to hydrogen plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Coal|w/o CCS:
-    definition: Capital cost of a new coal to hydrogen plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Electricity:
-    definition: Capital cost of a new hydrogen-by-electrolysis plant.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Gas|w/ CCS:
-    definition: Capital cost of a new gas to hydrogen plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Hydrogen|Gas|w/o CCS:
-    definition: Capital cost of a new gas to hydrogen plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Biomass|w/ CCS:
-    definition: Capital cost of a new biomass to liquids plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Biomass|w/o CCS:
-    definition: Capital cost of a new biomass to liquids plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Coal|w/ CCS:
-    definition: Capital cost of a new coal to liquids plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Coal|w/o CCS:
-    definition: Capital cost of a new coal to liquids plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Gas|w/ CCS:
-    definition: Capital cost of a new gas to liquids plant with CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Gas|w/o CCS:
-    definition: Capital cost of a new gas to liquids plant w/o CCS.
-    unit: USD_2010/kW
-- Capital Cost|Liquids|Oil:
-    definition: Capital cost of a new oil refining plant.
-    unit: USD_2010/kW
-- Efficiency|Electricity|Biomass|w/ CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new biomass power plant with CCS.
-    unit: '%'
-- Efficiency|Electricity|Biomass|w/o CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new biomass power plant w/o CCS.
-    unit: '%'
-- Efficiency|Electricity|Coal|w/ CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new coal power plant with CCS.
-    unit: '%'
-- Efficiency|Electricity|Coal|w/o CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new coal power plant w/o CCS.
-    unit: '%'
-- Efficiency|Electricity|Gas|w/ CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new gas power plant with CCS.
-    unit: '%'
-- Efficiency|Electricity|Gas|w/o CCS:
-    definition: Conversion efficiency (electricity produced per unit of primary energy
-      input) of a new gas power plant w/o CCS.
-    unit: '%'
-- Efficiency|Gases|Biomass|w/ CCS:
-    definition: Conversion efficiency (energy content of gases produced per unit of
-      primary energy input) of a new biomass to gas plant with CCS.
-    unit: '%'
-- Efficiency|Gases|Biomass|w/o CCS:
-    definition: Conversion efficiency (energy content of gases produced per unit of
-      primary energy input) of a new coal to gas plant w/o CCS.
-    unit: '%'
-- Efficiency|Gases|Coal|w/ CCS:
-    definition: Conversion efficiency (energy content of gases produced per unit of
-      primary energy input) of a new coal to gas plant with CCS.
-    unit: '%'
-- Efficiency|Gases|Coal|w/o CCS:
-    definition: Conversion efficiency (energy content of gases produced per unit of
-      primary energy input) of a new coal to gas plant w/o CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Biomass|w/ CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new biomass to hydrogen plant with CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Biomass|w/o CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new biomass to hydrogen plant w/o CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Coal|w/ CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new coal to hydrogen plant with CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Coal|w/o CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new coal to hydrogen plant w/o CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Electricity:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of electricity input) of a new hydrogen-by-electrolysis plant.
-    unit: '%'
-- Efficiency|Hydrogen|Gas|w/ CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new gas to hydrogen plant with CCS.
-    unit: '%'
-- Efficiency|Hydrogen|Gas|w/o CCS:
-    definition: Conversion efficiency (energy content of hydrogen produced per unit
-      of primary energy input) of a new gas to hydrogen plant w/o CCS.
-    unit: '%'
-- Efficiency|Liquids|Biomass|w/ CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new biomass to liquids plant with CCS.
-    unit: '%'
-- Efficiency|Liquids|Biomass|w/o CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new biomass to liquids plant w/o CCS.
-    unit: '%'
-- Efficiency|Liquids|Coal|w/ CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new coal to liquids plant with CCS.
-    unit: '%'
-- Efficiency|Liquids|Coal|w/o CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new coal to liquids plant w/o CCS.
-    unit: '%'
-- Efficiency|Liquids|Gas|w/ CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new gas to liquids plant with CCS.
-    unit: '%'
-- Efficiency|Liquids|Gas|w/o CCS:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new gas to liquids plant w/o CCS.
-    unit: '%'
-- Efficiency|Liquids|Oil:
-    definition: Conversion efficiency (energy content of liquids produced per unit
-      of primary energy input) of a new oil refining plant.
-    unit: '%'
-- Lifetime|Electricity|Biomass|w/ CCS:
-    definition: Lifetime of a new biomass power plant with CCS.
-    unit: years
-- Lifetime|Electricity|Biomass|w/o CCS:
-    definition: Lifetime of a new biomass power plant w/o CCS.
-    unit: years
-- Lifetime|Electricity|Coal|w/ CCS:
-    definition: Lifetime of a new coal power plant with CCS.
-    unit: years
-- Lifetime|Electricity|Coal|w/o CCS:
-    definition: Lifetime of a new coal power plant w/o CCS.
-    unit: years
-- Lifetime|Electricity|Gas|w/ CCS:
-    definition: Lifetime of a new gas power plant with CCS.
-    unit: years
-- Lifetime|Electricity|Gas|w/o CCS:
-    definition: Lifetime of a new gas power plant w/o CCS.
-    unit: years
-- Lifetime|Electricity|Hydro:
-    definition: Lifetime of a new hydropower plant.
-    unit: years
-- Lifetime|Electricity|Nuclear:
-    definition: Lifetime of a new nuclear power plant.
-    unit: years
-- Lifetime|Electricity|Geothermal:
-    definition: Lifetime of a new geothermal power plant.
-    unit: years
-- Lifetime|Electricity|Solar|CSP:
-    definition: Lifetime of a new concentrated solar power plant.
-    unit: years
-- Lifetime|Electricity|Solar|PV:
-    definition: Lifetime of a new PV unit.
-    unit: years
-- Lifetime|Electricity|Wind:
-    definition: Lifetime of a new wind power plant (report only if wind power is not
-      separated in onshore and offshore).
-    unit: years
-- Lifetime|Electricity|Wind|Offshore:
-    definition: Lifetime of a new offshore wind power plant.
-    unit: years
-- Lifetime|Electricity|Wind|Onshore:
-    definition: Lifetime of a new onshore wind power plant.
-    unit: years
-- Lifetime|Gases|Biomass|w/ CCS:
-    definition: Lifetime of a new biomass to gas plant with CCS.
-    unit: years
-- Lifetime|Gases|Biomass|w/o CCS:
-    definition: Lifetime of a new biomass to gas plant w/o CCS.
-    unit: years
-- Lifetime|Gases|Coal|w/ CCS:
-    definition: Lifetime of a new coal to gas plant with CCS.
-    unit: years
-- Lifetime|Gases|Coal|w/o CCS:
-    definition: Lifetime of a new coal to gas plant w/o CCS.
-    unit: years
-- Lifetime|Hydrogen|Biomass|w/ CCS:
-    definition: Lifetime of a new biomass to hydrogen plant with CCS.
-    unit: years
-- Lifetime|Hydrogen|Biomass|w/o CCS:
-    definition: Lifetime of a new biomass to hydrogen plant w/o CCS.
-    unit: years
-- Lifetime|Hydrogen|Coal|w/ CCS:
-    definition: Lifetime of a new coal to hydrogen plant with CCS.
-    unit: years
-- Lifetime|Hydrogen|Coal|w/o CCS:
-    definition: Lifetime of a new coal to hydrogen plant w/o CCS.
-    unit: years
-- Lifetime|Hydrogen|Electricity:
-    definition: Lifetime of a new hydrogen-by-electrolysis plant.
-    unit: years
-- Lifetime|Hydrogen|Gas|w/ CCS:
-    definition: Lifetime of a new gas to hydrogen plant with CCS.
-    unit: years
-- Lifetime|Hydrogen|Gas|w/o CCS:
-    definition: Lifetime of a new gas to hydrogen plant w/o CCS.
-    unit: years
-- Lifetime|Liquids|Biomass|w/ CCS:
-    definition: Lifetime of a new biomass to liquids plant with CCS.
-    unit: years
-- Lifetime|Liquids|Biomass|w/o CCS:
-    definition: Lifetime of a new biomass to liquids plant w/o CCS.
-    unit: years
-- Lifetime|Liquids|Coal|w/ CCS:
-    definition: Lifetime of a new coal to liquids plant with CCS.
-    unit: years
-- Lifetime|Liquids|Coal|w/o CCS:
-    definition: Lifetime of a new coal to liquids plant w/o CCS.
-    unit: years
-- Lifetime|Liquids|Gas|w/ CCS:
-    definition: Lifetime of a new gas to liquids plant with CCS.
-    unit: years
-- Lifetime|Liquids|Gas|w/o CCS:
-    definition: Lifetime of a new gas to liquids plant w/o CCS.
-    unit: years
-- Lifetime|Liquids|Oil:
-    definition: Lifetime of a new oil refining plant.
-    unit: years
 - OM Cost|Fixed|Electricity|Biomass|w/ CCS:
     definition: Annual fixed operation & maintainance cost of a new biomass power
       plant with CCS.
@@ -3051,90 +2667,6 @@
 - Import|Industry|Non-Metallic Minerals|Volume:
     definition: Import of non-metallic minerals
     unit: Mt/yr
-- Price|Industry|Iron and Steel|Scrap:
-    definition: Price of iron & steel scrap
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Ferrous Metals|Scrap:
-    definition: Price of non-ferrous metals scrap
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel|Iron Ore:
-    definition: Price of iron ore
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel|Pig Iron:
-    definition: Price of pig iron
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel|Sponge Iron:
-    definition: Price of sponge iron
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel:
-    definition: Price of iron & steel
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel|Primary:
-    definition: Price of primary steel
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Iron and Steel|Secondary:
-    definition: Price of secondary steel
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Ferrous Metals|Bauxite:
-    definition: Price of bauxite
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Ferrous Metals|Alumina:
-    definition: Price of alumina
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Ferrous Metals|Aluminium:
-    definition: Price of aluminium
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Ferrous Metals:
-    definition: Price of non-ferrous metals
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Metallic Minerals|Limestone:
-    definition: Price of limestone
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Metallic Minerals|Clinker:
-    definition: Price of clinker
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Metallic Minerals|Cement:
-    definition: Price of cement
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Non-Metallic Minerals:
-    definition: Price of non-metallic minerals
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Chemicals|Naphtha:
-    definition: Price of naphta
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Chemicals|Ethane:
-    definition: Price of ethane
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Chemicals|High Value Chemicals:
-    definition: Price of high value chemicals
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Chemicals|Plastics:
-    definition: Price of plastics
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
-- Price|Industry|Chemicals:
-    definition: Price of chemicals
-    unit: USD_2010/Mt
-    skip-region-aggregation: true
 - Consumption|D1:
     definition: Share of  total consumption accruing to each Decile
     unit: '%'