removed commented-out macro
removed commented-out macro