Add xva removal, and the install config