(Resampler code) Cleanups