Makefiles cleanup