FIXUP cleanup of macro