diff --git a/config/default.cfg b/config/default.cfg
index bd78e94d3fc93ce43e22c6f1e2c65a44fab2bef6..724113b3d958da78858ae4091930d1d6c8b9391a 100644
--- a/config/default.cfg
+++ b/config/default.cfg
@@ -273,7 +273,7 @@ cfg$gms$cm_bioenergymaxscen <- 0 # def <- 0
cfg$gms$c_tradecost_bio <- 2 # def <- 2
cfg$gms$cm_LU_emi_scen <- "SSP2" # def <- "SSP2"
cfg$gms$cm_1stgen_phaseout <- 0 # def <- 0
-cfg$gms$c21_cprice_red_factor <- 0.5 # def = 0.5
+cfg$gms$cm_cprice_red_factor <- 0.5 # def = 0.5
cfg$gms$cm_POPscen <- "pop_SSP2" # def <- "pop_SSP2"
cfg$gms$cm_GDPscen <- "gdp_SSP2" # def <- "gdp_SSP2"
diff --git a/core/datainput.gms b/core/datainput.gms
index 68ac688587af378968d2060f2d00a73c9fae481a..ebcc5bfe6067e01fe0b52d97b65388d75d00494c 100644
--- a/core/datainput.gms
+++ b/core/datainput.gms
@@ -847,7 +847,7 @@ $offdelim
*** then calculate the financing costs during construction
loop(te$(fm_dataglob("constrTme",te) > 0),
- pm_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
+ p_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
* sum(integ$(integ.val <= fm_dataglob("constrTme",te)),
$if %cm_techcosts% == "REG" (1.03 + pm_prtp(regi) + p_risk_premium_constr(regi) ) ** (integ.val - 0.5) - 1
$if %cm_techcosts% == "GLO" (1.03 + pm_prtp(regi) ) ** (integ.val - 0.5) - 1
@@ -855,14 +855,14 @@ $if %cm_techcosts% == "GLO" (1.03 + pm_prtp(regi) )
);
*** nuclear sees 3% higher interest rates during construction time due to higher construction time risk, see "The economic future of nuclear power - A study conducted at The University of Chicago" (2004)
loop(te$sameas(te,"tnrs"),
- pm_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
+ p_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
* sum(integ$(integ.val <= fm_dataglob("constrTme",te)),
$if %cm_techcosts% == "REG" (1.03 + 0.03 + pm_prtp(regi) + p_risk_premium_constr(regi) ) ** (integ.val - 0.5) - 1
$if %cm_techcosts% == "GLO" (1.03 + 0.03 + pm_prtp(regi) ) ** (integ.val - 0.5) - 1
)
);
-display pm_tkpremused;
+display p_tkpremused;
***for those technologies, for which differentiated costs are available for 2015-2040, use those
***$if %cm_techcosts% == "REG" loop(teRegTechCosts(te)$(not teLearn(te)),
***$if %cm_techcosts% == "REG" pm_inco0_t(ttot,regi,te)$(ttot.val ge 2015 AND ttot.val lt 2040) = p_inco0(ttot,regi,te);
@@ -876,11 +876,11 @@ display pm_tkpremused;
-pm_data(regi,"inco0",te) = (1 + pm_tkpremused(regi,te) ) * pm_data(regi,"inco0",te);
-pm_data(regi,"incolearn",te) = (1 + pm_tkpremused(regi,te) ) * pm_data(regi,"incolearn",te);
-p_inco0(ttot,regi,teRegTechCosts) = (1 + pm_tkpremused(regi,teRegTechCosts) ) * p_inco0(ttot,regi,teRegTechCosts);
-*** take region average pm_tkpremused for global convergence price
-fm_dataglob("inco0",te) = (1 + sum(regi, pm_tkpremused(regi,te))/sum(regi, 1)) * fm_dataglob("inco0",te);
+pm_data(regi,"inco0",te) = (1 + p_tkpremused(regi,te) ) * pm_data(regi,"inco0",te);
+pm_data(regi,"incolearn",te) = (1 + p_tkpremused(regi,te) ) * pm_data(regi,"incolearn",te);
+p_inco0(ttot,regi,teRegTechCosts) = (1 + p_tkpremused(regi,teRegTechCosts) ) * p_inco0(ttot,regi,teRegTechCosts);
+*** take region average p_tkpremused for global convergence price
+fm_dataglob("inco0",te) = (1 + sum(regi, p_tkpremused(regi,te))/sum(regi, 1)) * fm_dataglob("inco0",te);
if( cm_solwindenergyscen = 2,
loop(te$( sameas(te,"spv") OR sameas(te,"csp") OR sameas(te,"wind") ),
diff --git a/core/declarations.gms b/core/declarations.gms
index 2ee36f81a83fdfa36386380f8d75dcc17f3033dc..0df22bfacfcb89e3115c5cd03f959f0684ba6e25 100644
--- a/core/declarations.gms
+++ b/core/declarations.gms
@@ -136,7 +136,7 @@ p_boundtmp(tall,all_regi,all_te,rlf) "read-in bound on capacitie
p_bound_cap(tall,all_regi,all_te,rlf) "read-in bound on capacities"
pm_data(all_regi,char,all_te) "Large array for most technical parameters of technologies; more detail on the individual technical parameters can be found in the declaration of the set 'char' "
pm_cf(tall,all_regi,all_te) "Installed capacity availability - capacity factor (fraction of the year that a plant is running)"
-pm_tkpremused(all_regi,all_te) "turn-key cost premium used in the model (with a discount rate of 3+ pure rate of time preference); in comparison to overnight costs)"
+p_tkpremused(all_regi,all_te) "turn-key cost premium used in the model (with a discount rate of 3+ pure rate of time preference); in comparison to overnight costs)"
p_aux_tlt(all_te) "auxilliary parameter to determine maximal lifetime of a technology"
p_aux_check_omeg(all_te) "auxiliary parameter for an automated check that no technology is erroneously entered with pm_omeg('1') value of 0"
p_aux_check_tlt(all_te) "auxiliary parameter for an automated check that the pm_omeg calculation and filling of the opTimeYr2te mapping is in accordance"
diff --git a/core/presolve.gms b/core/presolve.gms
index 2eeeeb4115216a78ecaa6247b687ae15a547621b..c88b227b4d1d74339d42a56699e583b3e523c2bc 100644
--- a/core/presolve.gms
+++ b/core/presolve.gms
@@ -127,7 +127,7 @@ p_priceCO2forMAC(ttot,regi,enty) = pm_priceCO2(ttot,regi);
*** The co2 price for land-use entities needs to be reduced by the same factor as in MAgPIE.
*** Attention: the reduction factors need to be the same as in MAgPIE -> if they change in MAgPIE they need to be adapted here!
*** 1. Reduce co2 price for land-use entities by 50%, see s56_cprice_red_factor in MAgPIE
-p_priceCO2forMAC(ttot,regi,MacSectorMagpie) = p_priceCO2forMAC(ttot,regi,MacSectorMagpie) * c21_cprice_red_factor;
+p_priceCO2forMAC(ttot,regi,MacSectorMagpie) = p_priceCO2forMAC(ttot,regi,MacSectorMagpie) * cm_cprice_red_factor;
*** 2. Phase-in of co2 price for land-use entities, see line 22-35 in preloop.gms in modules/56_ghg_policy/price_jan19 in MAgPIE
p_priceCO2forMAC(ttot,regi,MacSectorMagpie)$(ttot.val lt cm_startyear) = 0;
p_priceCO2forMAC(ttot,regi,MacSectorMagpie)$(ttot.val eq cm_startyear) = 0.1 * p_priceCO2forMAC(ttot,regi,MacSectorMagpie);
diff --git a/main.gms b/main.gms
index 8097aba109c40e8b5b999bc84ac96ff9ebb780f1..aa3b7e836bd2d6da8730c504a5bc282f46ec4688 100644
--- a/main.gms
+++ b/main.gms
@@ -199,7 +199,7 @@ cm_bioenergy_tax "level of bioenergy tax in fraction of bioenergy price"
cm_bioenergymaxscen "bound on global pebiolc production excluding residues"
c_tradecost_bio "choose financal tradecosts for biomass (purpose grown pebiolc)"
cm_1stgen_phaseout "choose if 1st generation biofuels should phase out after 2020 (delatcap=0)"
-c21_cprice_red_factor "reduction factor for price on co2luc when calculating the revenues. Replicates the reduction applied in MAgPIE"
+cm_cprice_red_factor "reduction factor for price on co2luc when calculating the revenues. Replicates the reduction applied in MAgPIE"
cm_startyear "first optimized modelling time step"
cm_stagestart "start of staged accession for delay runs"
cm_stageend "end of staged accession for delay runs"
@@ -293,7 +293,7 @@ cm_bioenergymaxscen = 0; !! def = 3
c_tradecost_bio = 2; !! def = 2
$setglobal cm_LU_emi_scen SSP2 !! def = SSP2
cm_1stgen_phaseout = 0; !! def = 0
-c21_cprice_red_factor = 0.5; !! def = 0.5
+cm_cprice_red_factor = 0.5; !! def = 0.5
$setglobal cm_POPscen pop_SSP2 !! def = pop_SSP2
$setglobal cm_GDPscen gdp_SSP2 !! def = gdp_SSP2
diff --git a/modules/21_tax/off/not_used.txt b/modules/21_tax/off/not_used.txt
index 02dae82469da6fa0e58552e73fbda2395b962a35..b46a24dce8308ac21fe815b46144e8f37fba1243 100644
--- a/modules/21_tax/off/not_used.txt
+++ b/modules/21_tax/off/not_used.txt
@@ -47,3 +47,6 @@ pm_ttot_val,input,questionnaire
pm_tau_fe_tax_ES_st,input,questionnaire
pm_tau_fe_sub_ES_st,input,questionnaire
p21_implicitDiscRateMarg,input,questionnaire
+vm_emiMacSector,input,questionnaire
+cm_multigasscen,input,questionnaire
+cm_cprice_red_factor,input,questionnaire
diff --git a/modules/21_tax/on/equations.gms b/modules/21_tax/on/equations.gms
index dfce152aa267dcd95eaf1bdcaef2a446aa79df1e..8a3cf98e27895543fe3e3121fc126d09a937c5b3 100644
--- a/modules/21_tax/on/equations.gms
+++ b/modules/21_tax/on/equations.gms
@@ -59,7 +59,7 @@ v21_taxrevGHG(t,regi) =g= ( pm_taxCO2eq(t,regi) + pm_taxCO2eqSCC(t,regi) + pm_t
*' Documentation of overall tax approach is above at q21_taxrev.
***---------------------------------------------------------------------------
q21_taxrevCO2luc(t,regi)$(t.val ge max(2010,cm_startyear))..
-v21_taxrevCO2luc(t,regi) =g= ( pm_taxCO2eq(t,regi) + pm_taxCO2eqSCC(t,regi) + pm_taxCO2eqHist(t,regi))* c21_cprice_red_factor * vm_emiMacSector(t,regi,"co2luc")$(cm_multigasscen ne 3)
+v21_taxrevCO2luc(t,regi) =g= ( pm_taxCO2eq(t,regi) + pm_taxCO2eqSCC(t,regi) + pm_taxCO2eqHist(t,regi))* cm_cprice_red_factor * vm_emiMacSector(t,regi,"co2luc")$(cm_multigasscen ne 3)
- p21_taxrevCO2LUC0(t,regi);
***---------------------------------------------------------------------------
diff --git a/modules/21_tax/on/postsolve.gms b/modules/21_tax/on/postsolve.gms
index 5421cd20a9260f125eb95c1745e9eabd1539cef7..6b31e9da6bdf1c8633a2c9d7dfbe0e5243d9ef82 100644
--- a/modules/21_tax/on/postsolve.gms
+++ b/modules/21_tax/on/postsolve.gms
@@ -19,7 +19,7 @@ OPTION decimals =3;
*JH* !!Warning!! The same allocation block exists in presolve.gms.
*** Do not forget to update the other file.
p21_taxrevGHG0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * (vm_co2eq.l(ttot,regi) - vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3));
-p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * c21_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
+p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * cm_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inco0_t(ttot,regi,"ccsinje")
* ( sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) )
* (1/sm_ccsinjecrate) * sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) / pm_dataccs(regi,"quan","1");
diff --git a/modules/21_tax/on/presolve.gms b/modules/21_tax/on/presolve.gms
index fa716974b9e62f0d6d673bd253a7d2f644cb4591..40ec9210b3c1d8f4e5fdd8f16367cb5a2d16be79 100644
--- a/modules/21_tax/on/presolve.gms
+++ b/modules/21_tax/on/presolve.gms
@@ -17,7 +17,7 @@ p21_tau_so2_tax(ttot,regi)$(ttot.val>2100)=p21_tau_so2_tax("2100",regi);
*** Do not forget to update the other file.
*** save level value of all taxes
p21_taxrevGHG0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * (vm_co2eq.l(ttot,regi) - vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3));
-p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * c21_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
+p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * cm_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inco0_t(ttot,regi,"ccsinje")
* ( sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) )
* (1/sm_ccsinjecrate) * sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) / pm_dataccs(regi,"quan","1");
diff --git a/modules/26_agCosts/costs_trade/not_used.txt b/modules/26_agCosts/costs_trade/not_used.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3673f2c3ebd98a7d6680780cf2fc3cdc16e367e5
--- /dev/null
+++ b/modules/26_agCosts/costs_trade/not_used.txt
@@ -0,0 +1,2 @@
+name,type,reason
+pm_macCost,input,questionnaire
diff --git a/modules/26_agCosts/off/not_used.txt b/modules/26_agCosts/off/not_used.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3673f2c3ebd98a7d6680780cf2fc3cdc16e367e5
--- /dev/null
+++ b/modules/26_agCosts/off/not_used.txt
@@ -0,0 +1,2 @@
+name,type,reason
+pm_macCost,input,questionnaire
diff --git a/modules/39_CCU/off/not_used.txt b/modules/39_CCU/off/not_used.txt
new file mode 100644
index 0000000000000000000000000000000000000000..75cdadb709c3c0a7400e69400171ff2ff513ce72
--- /dev/null
+++ b/modules/39_CCU/off/not_used.txt
@@ -0,0 +1,4 @@
+name,type,reason
+vm_prodSe,input,questionnaire
+vm_co2capture,input,questionnaire
+fm_dataemiglob,input,questionnaire
diff --git a/modules/40_techpol/CombLowCandCoalPO/not_used.txt b/modules/40_techpol/CombLowCandCoalPO/not_used.txt
index 3c3a0917edb50864bb4152c613ba43527682d285..b28e2793fe8bfc8fcf8816da617e44b266a71481 100644
--- a/modules/40_techpol/CombLowCandCoalPO/not_used.txt
+++ b/modules/40_techpol/CombLowCandCoalPO/not_used.txt
@@ -1,20 +1,8 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
vm_prodSe, variable, ???
vm_demPe,variable,???
pm_prodCouple,parameter,???
pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/EVmandates/not_used.txt b/modules/40_techpol/EVmandates/not_used.txt
index 8365a13be0049aa540478966ca0205de50632701..932193bea19b627812f4345d0ef78eb7134b8f6f 100644
--- a/modules/40_techpol/EVmandates/not_used.txt
+++ b/modules/40_techpol/EVmandates/not_used.txt
@@ -1,22 +1,10 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
-sm_EJ_2_TWa,input,questionnaire
vm_cap,parameter,???
vm_demPe,parameter,???
vm_prodSe,parameter,???
pm_pop,parameter,???
pm_ttot_val,parameter,???
pm_prodCouple,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/NDC2018/not_used.txt b/modules/40_techpol/NDC2018/not_used.txt
index c06187829929fd9bbd10b436cbb720eb889ed36c..0a98882d8d3087872cf65f7cc1a472729fb97720 100644
--- a/modules/40_techpol/NDC2018/not_used.txt
+++ b/modules/40_techpol/NDC2018/not_used.txt
@@ -1,15 +1,3 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/NDC2018plus/not_used.txt b/modules/40_techpol/NDC2018plus/not_used.txt
index c5baf509530095fa92936c60cef5b79f931d347c..a85ff3761943ae0143c4f560df015b0dfe4d1b12 100644
--- a/modules/40_techpol/NDC2018plus/not_used.txt
+++ b/modules/40_techpol/NDC2018plus/not_used.txt
@@ -1,14 +1,2 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire
diff --git a/modules/40_techpol/NPi2018/not_used.txt b/modules/40_techpol/NPi2018/not_used.txt
index 66ff46f4b299807ba00df573bed2c60c07403539..ab73d83b4b70da2c8e91ef9558d64bea9e2cf9f6 100644
--- a/modules/40_techpol/NPi2018/not_used.txt
+++ b/modules/40_techpol/NPi2018/not_used.txt
@@ -1,16 +1,4 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire
vm_deltaCap,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/coalPhaseout/not_used.txt b/modules/40_techpol/coalPhaseout/not_used.txt
index 01248a504ea55abba4035822b30dbbee1b0ab7a2..0bc1210da53ab24ab25d16e89dc32dc74d4b3227 100644
--- a/modules/40_techpol/coalPhaseout/not_used.txt
+++ b/modules/40_techpol/coalPhaseout/not_used.txt
@@ -1,21 +1,9 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
vm_cap, variable, ???
vm_prodSe, variable, ???
vm_demPe,variable,???
pm_prodCouple,parameter,???
pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/coalPhaseoutRegional/not_used.txt b/modules/40_techpol/coalPhaseoutRegional/not_used.txt
index 42456b4bc47914ed7faafc7e55e188444424a0d2..9689ac912e649d13e15ac81250736444f41c4e74 100644
--- a/modules/40_techpol/coalPhaseoutRegional/not_used.txt
+++ b/modules/40_techpol/coalPhaseoutRegional/not_used.txt
@@ -1,20 +1,8 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
vm_cap, variable, ???
vm_prodSe, variable, ???
vm_demPe,variable,???
pm_prodCouple,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/lowCarbonPush/not_used.txt b/modules/40_techpol/lowCarbonPush/not_used.txt
index 0df0a14ee7d2cf7f740368f3df639d6538ae2edb..65eaf870e2d066f5ac37db722aee0380624edd6a 100644
--- a/modules/40_techpol/lowCarbonPush/not_used.txt
+++ b/modules/40_techpol/lowCarbonPush/not_used.txt
@@ -1,9 +1,3 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
vm_deltaCap, variable, ???
vm_prodSe, variable, ???
@@ -11,12 +5,6 @@ pm_ttot_val, parameter, ???
vm_demPe,variable,???
pm_prodCouple,parameter,???
pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire
diff --git a/modules/40_techpol/none/not_used.txt b/modules/40_techpol/none/not_used.txt
index ac6861cf54a76ddca71840a2696d9fdaca34d67a..e65a7ca110a9b83302fd3e7bb4894835dad7deae 100644
--- a/modules/40_techpol/none/not_used.txt
+++ b/modules/40_techpol/none/not_used.txt
@@ -1,9 +1,3 @@
-# | (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# | authors, and contributors see CITATION.cff file. This file is part
-# | of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# | AGPL-3.0, you are granted additional permissions described in the
-# | REMIND License Exception, version 1.0 (see LICENSE file).
-# | Contact: remind@pik-potsdam.de
name,type,reason
vm_demPe,variable,???
vm_cap,variable,???
@@ -12,12 +6,6 @@ vm_prodSe,variable,???
pm_ttot_val,parameter,???
pm_prodCouple,parameter,???
pm_pop,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
pm_gdp,input,questionnaire
vm_shUePeT,input,questionnaire
pm_NuclearConstraint,input,questionnaire