Remove unused BUFFER