fixup and removal