Remove use of deprecated User::EDIT_TOKEN_SUFFIX