MAINT remove some deprecated stuff