Removing some cruft from the Makefile