Connect and wait

Cleanup