Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev

* changes:
  Remove unused code (3/n)
  Use session id to search for rollbacks (2/n)
  Include session id when sending broadcasts (1/n)