added makefile and removed unnecessary old code from defs.h