Clean up more stuff from Makefile