Tidy up toString handling

Remove some deprecated events.

Add uid to entity queued so we can run parallel multiple scheduling
processes