First attempt at removing deprecated resampler