More cleanup of previous merge
Fix claim/activate flow and validation