Remove deprecated code
Remove more deprecated code
Merge branch 'experimental-4.x-remove-deprecated' into experimental-4.x