Remove .Samples from our code
Merge branch '1248' into 1223
Merge pull request #1250 from ogail/1223

 Remove .Samples from the code