Cleanup main Makefile a bit more
Housekeeping