cleanup and fixup by omni