ClearInvalidUnits added because DeleteEvents are not reliable