Remove UnitFinishedEvent