Cleanup trapWait, include TODO for timeoutWait fix