Remove buffer code