Remove ConnectionKind as part of bug #215 fix