Remove more Validated return values