Build: cleanup Configure-Makefile