removing this sampling nonsense
merge conflict fixed