Removed some  behavior from Buffer