Misc deprecation cleanup in 2.8... backported to 2.7 branch

User picture
User picture