Final Cleanup of Makefile