HOT validation changes w/ keypair, no 'required' & cleanup