Simplify forced validations because YAGNI