remove the nowait-s