Removed temporary buffer implementation