Validate improve

remove references, so we can merge when ready.