More deprecation expirations for 2.2.x and 3.0.0