Remove last vestiges of ChangePassword