removed unnecessary macro