Added more cleanup to Makefile