Updated Makefile, removed extraneous code