cleaning up Makefile and config.mk