Removal of optional validation refs #1