MAINT: Remove deprecated code for 0.6