Removed the density-estimation-stuff as it not really needed anymore and complicated things