Changed how the buffers are wiped