Some Makefile cleanup
Goma brks in 2 pieces when run, ugly