removed old methods from naught.bison, updated makefile