More minor cleanup, 'make clean' broken on Yosemite