Removed unnecessary buffers