Remove all (Z)Chaff, updating headers
Updates to Makefile