remove TargetStore and update EventStructure