Deprecated code removal