Revert handling remove in separate thread