Makefile cleanup
Defconfig cleanup