better cleanup-buffer