Fixes: #2075 cleaning of connectivity