Autumn cleaning of Makefile