MAINT remove deprecated code for 0.16