Just starting EVTYPE clean up