* Make sure we remove peers on disconnect in gossip state machine

* Clear up the code

* Add a comment