remove hard-coded master address