MAINT: delete more dead code