Makefile and config clean up