makefile rules cleanup