remove some buffer stuff