remove buffer manipulation