[#1887] Remove all deprecated code