Vendor updated
Removed deprecated code