Removing some legacy code/comments, an update hook from multihoice -> 6.4 which we will never be running in 7.