Further updates for removing omnithreads