[Update] Comment out buffer code