reduced variables to be extracted to basic set

ONS-UK-EFS-LCFS-time-series-extract.do

@@ -79,23 +79,18 @@ local do_extracts 1
 * put case in each keep var if otherwise empty
 
 * -> dvhh file
-* basic weighting & consumption expenditure codes
-* p60*t p61*t p630* 
-local dvhh_keepvars = ""
+* basic weighting 
+local dvhh_keepvars = "case weighta weightq"
 * needed for income equivalisation later
 local dvhh_keepvars = "`dvhh_keepvars' incanon a055 g018 g019 p116* p344* p389* p396*"  	
-* DEMAND 2.3 (older people mobile lives)
-*local dvhh_keepvars = "`dvhh_keepvars' b480 b481 b485 cc5413t c73312t" // overseas travel expenditures
-* DEMAND 3.1 (adapting infrastructures)
-*  a1701 a1711
-local dvhh_keepvars = "`dvhh_keepvars' a103 a108 a128 a130 a15* a16*" // energy using appliances
+* DEMAND 2.1.1 (domestic ICT)
+local dvhh_keepvars = "`dvhh_keepvars' a101 a170 a171 a172 a190 a191 a192 a193 a194 a195 a1641 a1642 a1643 a1644 a1645 a1661 a1701 a1711" 
 
 * -> dvper file
 local dvper_keepvars = "case"
 
 * -> rawhh file
-* DEMAND 2.3 (older people mobile lives)
-local rawhh_keepvars = "flydes*" // flights - NB see 2012 fix below in rawhh section
+local rawhh_keepvars = "case" 
 
 * -> rawper file
 local rawper_keepvars = "case"