Change validation rules and drop unneeded fields

Signed-off-by: Ross Gallagher <ross_gallagher@rossgallagher.co.uk>