cleanups related to Dartium 36

TBR