Finish makefile cleanup