Remove classes and methods deprecated in 4.4.x