Removed Buffer() and SetBuffer(), no longer required