Merge: makefiles: Remove dead code