Include any trace token in events
Remove dead files
Update CHANGES