Makefile cleanup...