Some old buffer code was left over