[4.2] Validator : remove duplicate code