Cleanup. Modification of Makefile.