[WIP] Cleanup duplicate connection handling