Some clean-up regarding communication on state on connection / re-connection of client and server