Cleaning up eventdata/userdata usages