Clean up

to not blow up the buffers