MAINT: more code churn
MAINT: remove an obsolete module