[BUNDLE] retire dm-types, cleanup