Removed a few buffers copies