Removed buffer utils