Merge "Clean up Connection API"