Makefile/Dependency cleanup