Remove zm_config_defines.h as per Master after checking