VOYEUR: Remove some useless variables in Event, cleanup