makefiles update relative to recent code cleanup