Remove deprecated code [ci skip]