Properly destroy both buffers now, minor refactoring.