CleanUp
SampleGenerator fix