Remove duplicate EventCost code introduced in merge commit 3f8660b