cleanup + add connected counter