Deprecated code removal -2