Correct cleanup of scattering buffers