Newer more robust indexing + New vs Old  sample

The new indexing cross references the Samples = 0 with the
NumberOfValidSamples to avoid removing data points that are actually
zero