Removed references to validation class.