Remove cruft from Makefile and source tree