BatchSampling - cleanup