fix a bug in the validate pass, caught by Eastwood
remove a couple of now useless doto, caught by Eastwood