diff --git a/catalog/jobs/discover.py b/catalog/jobs/discover.py
index a5ce8de0..606c858f 100644
--- a/catalog/jobs/discover.py
+++ b/catalog/jobs/discover.py
@@ -5,7 +5,6 @@ from django.conf import settings
 from django.core.cache import cache
 from django.db.models import Count, F
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
 from loguru import logger
 
 from boofilsic.settings import MIN_MARKS_FOR_DISCOVER
diff --git a/catalog/search/views.py b/catalog/search/views.py
index 0f5e234f..f4a8ca73 100644
--- a/catalog/search/views.py
+++ b/catalog/search/views.py
@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.cache import cache
 from django.core.exceptions import BadRequest
 from django.shortcuts import redirect, render
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from rq.job import Job
 
diff --git a/catalog/sites/douban_movie.py b/catalog/sites/douban_movie.py
index 0e28e5d3..57a34ee2 100644
--- a/catalog/sites/douban_movie.py
+++ b/catalog/sites/douban_movie.py
@@ -1,8 +1,6 @@
 import json
 import logging
 
-from django.utils.translation import gettext_lazy as _
-
 from catalog.common import *
 from catalog.movie.models import *
 from catalog.tv.models import *
diff --git a/catalog/views.py b/catalog/views.py
index 85412b96..5b1e9c36 100644
--- a/catalog/views.py
+++ b/catalog/views.py
@@ -6,7 +6,7 @@ from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.clickjacking import xframe_options_exempt
 from django.views.decorators.http import require_http_methods
 
diff --git a/catalog/views_edit.py b/catalog/views_edit.py
index fa709399..d8a19ccc 100644
--- a/catalog/views_edit.py
+++ b/catalog/views_edit.py
@@ -5,7 +5,7 @@ from django.core.exceptions import BadRequest, PermissionDenied
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from loguru import logger
 
diff --git a/common/templatetags/duration.py b/common/templatetags/duration.py
index 0c5bb0e8..4e77d4f3 100644
--- a/common/templatetags/duration.py
+++ b/common/templatetags/duration.py
@@ -4,7 +4,7 @@ from django import template
 from django.conf import settings
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from catalog.common.models import item_categories
 from catalog.search.views import visible_categories as _visible_categories
diff --git a/common/templatetags/mastodon.py b/common/templatetags/mastodon.py
index db9ef435..83cb9191 100644
--- a/common/templatetags/mastodon.py
+++ b/common/templatetags/mastodon.py
@@ -1,5 +1,5 @@
 from django import template
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from users.models import APIdentity
 
diff --git a/common/utils.py b/common/utils.py
index 077afd75..190f4317 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -8,7 +8,7 @@ from django.core.exceptions import PermissionDenied
 from django.core.signing import b62_decode, b62_encode
 from django.http import Http404, HttpRequest, HttpResponseRedirect, QueryDict
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from .config import PAGE_LINK_NUMBER
 
diff --git a/journal/exporters/doufen.py b/journal/exporters/doufen.py
index 448d77bf..466f44ca 100644
--- a/journal/exporters/doufen.py
+++ b/journal/exporters/doufen.py
@@ -2,7 +2,6 @@ import os
 from datetime import datetime
 
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _
 from openpyxl import Workbook
 
 from catalog.models import *
diff --git a/journal/importers/letterboxd.py b/journal/importers/letterboxd.py
index c925a576..0746c7b2 100644
--- a/journal/importers/letterboxd.py
+++ b/journal/importers/letterboxd.py
@@ -4,7 +4,7 @@ import zipfile
 
 import pytz
 from django.utils.dateparse import parse_datetime
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from loguru import logger
 from markdownify import markdownify as md
 
diff --git a/journal/importers/opml.py b/journal/importers/opml.py
index f962801b..184b8151 100644
--- a/journal/importers/opml.py
+++ b/journal/importers/opml.py
@@ -1,7 +1,7 @@
 import django_rq
 import listparser
 from auditlog.context import set_actor
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from loguru import logger
 from user_messages import api as msg
 
diff --git a/journal/views/collection.py b/journal/views/collection.py
index f2e85eed..82ca2e34 100644
--- a/journal/views/collection.py
+++ b/journal/views/collection.py
@@ -5,7 +5,7 @@ from django.http import Http404, HttpRequest, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
 from catalog.models import Item
diff --git a/journal/views/common.py b/journal/views/common.py
index bfcfb834..de46f5b7 100644
--- a/journal/views/common.py
+++ b/journal/views/common.py
@@ -6,7 +6,7 @@ from django.core.paginator import Paginator
 from django.db.models import F, Min, OuterRef, Subquery
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
 from catalog.models import *
diff --git a/journal/views/mark.py b/journal/views/mark.py
index c9e2cfac..582ea967 100644
--- a/journal/views/mark.py
+++ b/journal/views/mark.py
@@ -7,7 +7,7 @@ from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from loguru import logger
 
diff --git a/journal/views/post.py b/journal/views/post.py
index 2cf1faa1..fdc35fd4 100644
--- a/journal/views/post.py
+++ b/journal/views/post.py
@@ -2,7 +2,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.exceptions import BadRequest, ObjectDoesNotExist, PermissionDenied
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
 from common.utils import AuthedHttpRequest, get_uuid_or_404, target_identity_required
diff --git a/journal/views/profile.py b/journal/views/profile.py
index 97529180..12506bd1 100644
--- a/journal/views/profile.py
+++ b/journal/views/profile.py
@@ -2,7 +2,6 @@ import datetime
 
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
-from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_http_methods
 
 from catalog.models import *
diff --git a/journal/views/review.py b/journal/views/review.py
index a726cc7b..0715f63c 100644
--- a/journal/views/review.py
+++ b/journal/views/review.py
@@ -9,7 +9,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 
 from catalog.models import *
diff --git a/journal/views/tag.py b/journal/views/tag.py
index 45a96e69..e026c475 100644
--- a/journal/views/tag.py
+++ b/journal/views/tag.py
@@ -1,14 +1,12 @@
 from django.contrib.auth.decorators import login_required
-from django.db.models import Count
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from user_messages import api as msg
 
 from catalog.models import *
-from takahe.models import Identity
 from users.models import APIdentity
 
 from ..forms import *
diff --git a/journal/views/wrapped.py b/journal/views/wrapped.py
index a85317cd..5cae4160 100644
--- a/journal/views/wrapped.py
+++ b/journal/views/wrapped.py
@@ -9,7 +9,7 @@ from django.db.models import Count, F
 from django.db.models.functions import ExtractMonth
 from django.http import HttpRequest, HttpResponseRedirect
 from django.http.response import HttpResponse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.generic.base import TemplateView
 
 from catalog.models import (
diff --git a/mastodon/api.py b/mastodon/api.py
index cec9d0f2..9e56ebae 100644
--- a/mastodon/api.py
+++ b/mastodon/api.py
@@ -9,7 +9,7 @@ import django_rq
 import requests
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from loguru import logger
 
 from mastodon.utils import rating_to_emoji
diff --git a/social/views.py b/social/views.py
index 172d3c95..9fc136e3 100644
--- a/social/views.py
+++ b/social/views.py
@@ -1,7 +1,6 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_http_methods
 
 from catalog.models import *
diff --git a/takahe/utils.py b/takahe/utils.py
index aab3d549..b0f1defc 100644
--- a/takahe/utils.py
+++ b/takahe/utils.py
@@ -8,7 +8,7 @@ from django.core.cache import cache
 from django.core.files.images import ImageFile
 from django.db.models import Count
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from PIL import Image
 
 from .models import *
diff --git a/users/account.py b/users/account.py
index d77a0f81..f421da29 100644
--- a/users/account.py
+++ b/users/account.py
@@ -16,19 +16,18 @@ from django.db.models import Count, Q
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_http_methods
 from loguru import logger
 
 from common.config import *
 from common.utils import AuthedHttpRequest
 from journal.models import remove_data_by_user
-from mastodon import mastodon_request_included
 from mastodon.api import *
 from mastodon.api import verify_account
 from takahe.utils import Takahe
 
-from .models import Preference, User
+from .models import User
 from .tasks import *
 
 # the 'login' page that user can see
@@ -146,7 +145,6 @@ def connect(request):
 
 # mastodon server redirect back to here
 @require_http_methods(["GET"])
-@mastodon_request_included
 def connect_redirect_back(request):
     code = request.GET.get("code")
     if not code:
@@ -252,14 +250,12 @@ def login_existing_user(request, existing_user):
     return response
 
 
-@mastodon_request_included
 @login_required
 def logout(request):
     # revoke_token(request.user.mastodon_site, request.user.mastodon_token)
     return auth_logout(request)
 
 
-@mastodon_request_included
 @login_required
 @require_http_methods(["POST"])
 def reconnect(request):
diff --git a/users/data.py b/users/data.py
index 127eae06..495ce93a 100644
--- a/users/data.py
+++ b/users/data.py
@@ -10,7 +10,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils import translation
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from common.config import *
 from common.utils import GenerateDateUUIDMediaFilePath, profile_identity_required
diff --git a/users/profile.py b/users/profile.py
index 994a7c81..1e4a2769 100644
--- a/users/profile.py
+++ b/users/profile.py
@@ -1,43 +1,13 @@
-from datetime import timedelta
-from typing import Any, Dict
-from urllib.parse import quote
-
-import django_rq
 from django import forms
 from django.conf import settings
-from django.contrib import auth, messages
-from django.contrib.auth import authenticate
 from django.contrib.auth.decorators import login_required
-from django.core.cache import cache
-from django.core.exceptions import BadRequest, ObjectDoesNotExist
-from django.core.mail import send_mail
-from django.core.signing import TimestampSigner
-from django.core.validators import EmailValidator
-from django.db.models import Count, Q
-from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect, render
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-from loguru import logger
 
-from common.config import *
-from common.utils import AuthedHttpRequest
-from journal.exporters.doufen import export_marks_task
-from journal.importers.douban import DoubanImporter
-from journal.importers.goodreads import GoodreadsImporter
-from journal.importers.opml import OPMLImporter
-from journal.models import remove_data_by_user, reset_journal_visibility_for_user
-from mastodon import mastodon_request_included
-from mastodon.api import *
-from mastodon.api import verify_account
-from social.models import reset_social_visibility_for_user
 from takahe.models import Identity as TakaheIdentity
 from takahe.utils import Takahe
 
-from .models import Preference, User
-from .tasks import *
-
 
 class ProfileForm(forms.ModelForm):
     class Meta:
diff --git a/users/views.py b/users/views.py
index 2588d825..0ce50a4a 100644
--- a/users/views.py
+++ b/users/views.py
@@ -5,7 +5,7 @@ from django.core.exceptions import BadRequest
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import redirect, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from common.config import *
 from common.utils import (