diff --git a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/munich/synpopTrampa/PrepareFrequencyMatrixTrampa.java b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/munich/synpopTrampa/PrepareFrequencyMatrixTrampa.java
index 0183e4b72..c87e3036a 100644
--- a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/munich/synpopTrampa/PrepareFrequencyMatrixTrampa.java
+++ b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/munich/synpopTrampa/PrepareFrequencyMatrixTrampa.java
@@ -1,15 +1,16 @@
 package de.tum.bgu.msm.syntheticPopulationGenerator.munich.synpopTrampa;
 
-import com.google.common.collect.*;
-import com.pb.common.datafile.TableDataSet;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.collect.Table;
+import de.tum.bgu.msm.common.datafile.TableDataSet;
 import de.tum.bgu.msm.syntheticPopulationGenerator.DataSetSynPop;
 import de.tum.bgu.msm.syntheticPopulationGenerator.properties.PropertiesSynPop;
 import de.tum.bgu.msm.utils.SiloUtil;
 import org.apache.log4j.Logger;
-import org.paukov.combinatorics3.Generator;
 
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class PrepareFrequencyMatrixTrampa {
diff --git a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/GeoDataReaderSanFran.java b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/GeoDataReaderSanFran.java
index c2ca008d9..367d31770 100644
--- a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/GeoDataReaderSanFran.java
+++ b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/GeoDataReaderSanFran.java
@@ -1,9 +1,12 @@
 package de.tum.bgu.msm.syntheticPopulationGenerator.sanFrancisco;
 
-import com.pb.common.datafile.TableDataSet;
+import de.tum.bgu.msm.common.datafile.TableDataSet;
 import de.tum.bgu.msm.data.Region;
 import de.tum.bgu.msm.data.Zone;
-import de.tum.bgu.msm.data.geo.*;
+import de.tum.bgu.msm.data.geo.County;
+import de.tum.bgu.msm.data.geo.GeoDataMstm;
+import de.tum.bgu.msm.data.geo.MstmRegion;
+import de.tum.bgu.msm.data.geo.MstmZone;
 import de.tum.bgu.msm.io.GeoDataReaderMstm;
 import de.tum.bgu.msm.io.input.GeoDataReader;
 import de.tum.bgu.msm.utils.SiloUtil;
diff --git a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/SyntheticPopUs.java b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/SyntheticPopUs.java
index 6359ae717..f143e2ffa 100644
--- a/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/SyntheticPopUs.java
+++ b/synthetic-population/src/main/java/de/tum/bgu/msm/syntheticPopulationGenerator/sanFrancisco/SyntheticPopUs.java
@@ -3,15 +3,18 @@
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
-import com.pb.common.datafile.TableDataSet;
-import com.pb.common.util.ResourceUtil;
+import de.tum.bgu.msm.common.datafile.TableDataSet;
+import de.tum.bgu.msm.common.util.ResourceUtil;
 import de.tum.bgu.msm.container.DataContainer;
 import de.tum.bgu.msm.data.Location;
 import de.tum.bgu.msm.data.MicroLocation;
 import de.tum.bgu.msm.data.Zone;
 import de.tum.bgu.msm.data.accessibility.Accessibility;
 import de.tum.bgu.msm.data.accessibility.CommutingTimeProbability;
-import de.tum.bgu.msm.data.dwelling.*;
+import de.tum.bgu.msm.data.dwelling.DefaultDwellingTypes;
+import de.tum.bgu.msm.data.dwelling.Dwelling;
+import de.tum.bgu.msm.data.dwelling.DwellingUtils;
+import de.tum.bgu.msm.data.dwelling.RealEstateDataManager;
 import de.tum.bgu.msm.data.geo.GeoDataMstm;
 import de.tum.bgu.msm.data.geo.MstmZone;
 import de.tum.bgu.msm.data.household.Household;
@@ -47,7 +50,6 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.*;
-import java.util.function.BiFunction;
 
 /**
  * Generates a simple synthetic population for the MSTM Study Area