Better buffer deletion