As an additional improvement, REMOVE_CMD could be replaced throughout the makefiles.