[WIP] Cleanup duplicate connection handling
[FOLD] Remove unused files