remove extra scenario name address macro