Script and Makefile cleanup