improved buffer killing