Remove unnecessary validation