add remove connection code but this is some question for killing connection yet