Cleanup of Makefile