MAINT: Effectively remove deprecated parameters