Removed "signal-success" (cannot reference remvoed WaitHandlers)