Remove some useless validation elements