More Demo code cleanup

Monster Iestynrequested to merge
more-demo-cleanup into next

Just doing some tidying up around the demo recording/playback code and related.

Merge request reports