Add clean buffers functions