Cleanup for EVS