Clean up Makefile further.
Cleaned up Makefile further.