Tidier buffer clearing