Merge: code: cleanup some docunits