Fix and re-add connection deletion