More cleaning of Makefiles