M: further lib dependency cleanup