Basic makefile cleanup and simplifications

Should have no effect.  More later.