Removed numSample1D, numSample1DT, numSample2D, #983