Some cleanup on the receiver side.
Watching connect events in receiver.