diff --git a/input/counts_mapping.csv b/input/counts_mapping.csv
index 8154cb72..5aed1d25 100644
--- a/input/counts_mapping.csv
+++ b/input/counts_mapping.csv
@@ -1 +1,216 @@
-station;linkId;using;comment
\ No newline at end of file
+MQ_ID;linkid;Using;Kommentar;Check
+10016;80205;;same as 10015;
+10057;39350;;Cannot see Karlshorster Straße ;
+10058;46079;;Cannot see Karlshorster Straße ;
+10063;112029;;same as 10062;
+10074;160571;;Link is going over the buildings;
+10075;;;;
+10076;157038;;Link is going over the buildings;
+10105;127709;;Cannot see Traberweg;
+10110;138887;;same as above;
+10128;26748;;same as above;
+10216;27049;;;Presumable mapped incorrectly
+10217;27050;;;Presumably mapped incorrectly
+10226;119051;;same as 10225;
+10228;;;;
+10282;86724;;same as 10282;
+10287;9211;;same as 10286, don't know what LM means;Zählung sehr niedrig, 2017 - 2018 Baustelle und Straße stark verengt
+10292;107646;;same as 10266;
+10368;88714;;same as 10367;
+10381;106347;;same as 106347;
+10383;106359;;same as 10382;
+10395;80193;;same as 10394;
+10401;106330;;same as 10400;
+10405;12403;;same as 10404;
+10438;;;;
+10450;;;;
+10452;;;;
+10454;31011;;same as above;
+10481;71917;;Cannot see Köpenicker Straße;
+10486;103551;;doubt;
+10512;11352;;;Presumably mapped incorrectly (residential)
+10516;11349;;same as 10515;
+20000;109556;;Direction of link unknown;
+20002;33448;;Direction of link unknown;
+20003;78456;;Direction of link unknown;
+20004;51592;;Direction of link unknown;
+20005;77550;;Direction of link unknown;
+20009;;;same as 20008;
+20010;;;same as 20008;
+20032;;;same as 20028;
+20038;;;same as 20013;
+20039;;;same as 20013;
+20040;;;same as 20037;
+20041;;;same as 20013;
+20046;;;same as 33436;
+20049;;;same as 20044;
+20052;;;same as 20044;
+20057;;;same as 20045;
+20060;;;same as 20058;
+20064;;;same as 20062;
+20070;;;same as 20069;
+20074;;;same as 20071;
+20076;98319;;unclear;
+20083;;;same as 20078;
+20087;;;same as 20085;
+20092;;;same as 20090;
+20107;;;same as 20105;
+20108;;;same as 20105;
+20109;;;same as 20105;
+20111;144032;;unclear;
+20116;;;unclear, same as 20111;
+20122;;;same as 20121;
+20123;;;same as 20121;
+20137;;;same as 20135;
+20140;;;same as 20139;
+20141;;;same as 20139;
+20142;;;unclear, should be same as 20139, but loses 6000 cars;
+20147;;;same as 20145;
+20149;51291;;;
+20150;;;same as 20149;
+20153;;;same as 20152;
+20154;;;same as 20152;
+20155;;;same as 20152;
+20156;;;same as 20152;
+20181;70732;;;Edge of model area
+20183;83367;;;Edge of model area
+20184;75092;;low sim values, traffic that goes around Berlin;
+20185;122545;;low sim values, traffic that goes around Berlin;
+20186;152195;;low sim values, traffic that goes around Berlin;
+20188;122540;;;A2 Abfahrt Lehnin, hohe modellierte Werte, fast alle Freight
+20219;;;no description, oriantation;
+20220;;;no description, oriantation;
+20253;35038;;no description, oriantation;
+20254;;;same as 20253, no description, oriantation;
+20259;;;same as 20258, indicates long and a lot stops;
+20260;;;same as 20258, indicates long and a lot stops;
+20261;51824;;no description, oriantation;
+20267;;;no description, oriantation;
+20271;79995;;no description, oriantation;
+20272;619;;no description, oriantation;
+20273;66887;;no description, oriantation;
+20275;;;same as 20274, indicates long and a lot stops;
+20276;;;same as 20274, indicates long and a lot stops;
+20294;152202;;same as 20182, should be 20186 + 20188;
+20367;;;missing in network;
+20378;36708;;Outlier;
+20387;;;same as 20386;
+20388;;;same as 20386;
+20389;;;same as 20386;
+20390;;;same as 20386;
+20394;;;same as 20391;
+20395;;;same as 20391;
+20404;;;unlcear;
+20409;;;same as 20408;
+20411;;;same as 20408;
+20412;;;same as 20408;
+20413;;;same as 20408;
+20416;;;same as 20414;
+20423;147562;;problems with lanes, point 20434;
+20432;24140;;problems with lanes, point 20447;
+20434;;;no lanes given, see 20423;
+20446;;;no lanes given;
+20447;;;no lanes given, see 20432;
+20448;137677;;problems with lanes, see 20457;
+20450;137678;;only for main roadway;
+20451;137686;;only for main roadway;
+20452;137663;;problems with lanes, see 20467;
+20456;63901;;only for main roadway;
+20457;;;no lanes given, see 20457;
+20467;;;no lanes given, see 20452;
+20471;59613;;only for main roadway;
+20478;129133;;should be 20474 + 20481, same as 20476;
+20483;7632;;same as 20479;
+20485;;;missing in network;
+20486;;;same as 20440;
+20491;51393;;no lanes given;
+20495;;;unclear descrition;
+20499;;;same as 20497;
+20501;132573;;unclear descrition;
+20508;;;no lanes given;
+20510;85100;;same as 20509;
+20511;85100;;same as 20509;
+20512;159940;;Massive outlier? Only few 100 cars counted;
+21519;133745;;Edge of network, low sim values;
+21520;133733;;Edge of network, low sim values;
+21521;104614;;Edge of network, low sim values;
+21522;104570;;Edge of network, low sim values;
+21524;113860;;entrance?;
+21525;113859;;exit?;
+21526;113861;;entrance?;
+21527;78234;;Edge of network, low sim values;
+21561;29365;;unclear descrition;
+21562;;;unclear descrition;
+21563;59618;;unclear descrition;
+21564;59600;;unclear descrition;
+21578;87696;;unclear descrition;
+21582;89374;;unclear descrition;
+21584;33573;;unclear descrition;
+21585;21930;;unclear descrition;
+21586;33582;;unclear descrition;
+21593;87534;;unclear descrition;
+21595;102872;;unclear descrition;
+21597;127756;;unclear descrition;
+21617;47843;;Edge of network, low sim values;
+21618;36329;;Edge of network, low sim values;
+21619;27462;;main road? Edge of network, low sim values;
+21620;154052;;exit? Edge of network, low sim values;
+21622;154051;;entrance? Edge of network, low sim values;
+21625;47849;;should be 21622 + 21619, edge of network low sim values;
+21626;66584;;Edge of network, low sim values;
+21627;27423;;main road? Edge of network, low sim values;
+21628;27731;;main road? Edge of network, low sim values;
+21629;50110;;exit? Edge of network, low sim values;
+21630;123713;;entrance? Edge of network, low sim values;
+21631;123716;;exit? Edge of network, low sim values;
+21632;123715;;entrance? -> outlier;
+21633;66493;;should be 21627 + 21630, Edge of netwrok, low sim values;
+21634;66528;;Edge of network, low sim values;
+21639;102838;;main road? Edge of network, low sim values;
+21640;158910;;main road? Edge of network, low sim values;
+21641;157218;;exit? Edge of network, low sim values;
+21642;157214;;entrance? Edge of network, low sim values;
+21643;42886;;exit? Edge of network, low sim values;
+21645;;;missing in network;
+21646;;;missing in network;
+21648;;;missing in network;
+21649;;;missing in network;
+21650;145321;;entrance? Edge of network, low sim values;
+21651;150582;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21652;18051;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21653;31314;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21654;31315;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21655;143673;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21656;31306;;questionable coordinates, but clear description, Dreieck Spreeau, low sim values values, traffic that goes around Berlin;
+21657;82384;;low sim values, traffic that goes around Berlin;
+21658;82371;;low sim values, traffic that goes around Berlin;
+21659;156794;;exit?;Edge of model area
+21661;156793;;exit?;Edge of model area
+21819;125244;;same as 21818;
+21823;;;looks like before entrace, then same as 21821;
+21827;;;same as 21826;
+21833;153392;;same as 21830;
+21835;153391;;same as 21830;
+21836;112396;;same as 21830;
+21837;116350;;same as 21830;
+21838;88647;;same as 21830;
+21839;84851;;same as 21830;
+21845;15766;;unclear descrition;
+21846;116163;;unclear descrition;
+21855;104702;;same as 21854;
+21868;;;same as 20027;
+21869;;;same as 20026;
+21870;;;same as 20026;
+21875;;;same as 21871;
+21876;113265;;same as 21871;
+21878;;;same as 21877;
+21879;98703;;same as 21877;
+21882;40992;;same sa 21882;
+21883;87879;;same sa 21882;
+21884;;;same sa 21882;
+21885;;;same sa 21882;
+21887;;;samea s 21886;
+21905;;;same as 21904;
+21906;98695;;same as 21904;
+21907;37755;;same as 21904;
+21913;110354;;same as 21908;
\ No newline at end of file
diff --git a/src/main/java/org/matsim/run/OpenBerlinScenario.java b/src/main/java/org/matsim/run/OpenBerlinScenario.java
index 2ee62550..abaeb224 100644
--- a/src/main/java/org/matsim/run/OpenBerlinScenario.java
+++ b/src/main/java/org/matsim/run/OpenBerlinScenario.java
@@ -17,7 +17,6 @@
 import org.matsim.core.router.costcalculators.TravelDisutilityFactory;
 import org.matsim.core.router.util.TravelTime;
 import org.matsim.prepare.RunOpenBerlinCalibration;
-import org.matsim.prepare.population.AssignIncome;
 import org.matsim.run.scoring.AdvancedScoringConfigGroup;
 import org.matsim.run.scoring.AdvancedScoringModule;
 import org.matsim.simwrapper.SimWrapperConfigGroup;