Merge "Removing deprecated methods from Validate"