Removing more deprecated code for validation