Remove deprecated code and other updates relating to ConnectionIdentifier

Fixes #1555 and #1505 for 3.0.