MAINT: remove more redundant imports from the distribution infrastructure module