fixup cleanup