Merge "Clean up concurrency code and always connect"