Remove deprecations from master (follow up to #7922)