Issue #3291784 by penyaskito, hlopez: Remove deprecated code and code paths planned for removal in 4.0.0