removed references to the old validator function