Remove unnecessary validation check