Merge "set-verity-state: Refactor & remove even more dead code"