[POLISH] Validation clearn up