Remove Buffer and update Makefile.