Removes unnessary or
Adds required validation rule