diff --git a/solanaceae/tox_contacts/tox_contact_model2.cpp b/solanaceae/tox_contacts/tox_contact_model2.cpp
index c1d46a4..0bba3e8 100644
--- a/solanaceae/tox_contacts/tox_contact_model2.cpp
+++ b/solanaceae/tox_contacts/tox_contact_model2.cpp
@@ -76,7 +76,7 @@ void ToxContactModel2::iterate(float delta) {
 		std::vector<Contact4> updated;
 
 		_cs.registry().view<Contact::Components::ToxGroupPeerEphemeral, Contact::Components::ConnectionState>().each([this, &updated](auto c, const auto& tox_peer, auto& con) {
-			auto state_opt = std::get<0>(_t.toxGroupPeerGetConnectionStatus(tox_peer.group_number, tox_peer.peer_number));
+			auto [state_opt, _] = _t.toxGroupPeerGetConnectionStatus(tox_peer.group_number, tox_peer.peer_number);
 			if (!state_opt.has_value()) {
 				return;
 			}
diff --git a/solanaceae/tox_contacts/tox_contact_model2.hpp b/solanaceae/tox_contacts/tox_contact_model2.hpp
index 3096680..72e4e12 100644
--- a/solanaceae/tox_contacts/tox_contact_model2.hpp
+++ b/solanaceae/tox_contacts/tox_contact_model2.hpp
@@ -25,7 +25,6 @@ class ToxContactModel2 : public ContactModel4I, public ToxEventI {
 		ToxContactModel2(ContactStore4I& cs, ToxI& t, ToxEventProviderI& tep);
 		virtual ~ToxContactModel2(void);
 
-		// TODO: continually fetch group peer connection state, since JF does not want to add cb/event
 		void iterate(float delta);
 
 	protected: // mmi