Get ride of validation hash, all in definition now