diff --git a/src/pretalx/sso_provider/templates/socialaccount/base.html b/src/pretalx/sso_provider/templates/socialaccount/base.html
index a8d197789..7cfd0ea57 100644
--- a/src/pretalx/sso_provider/templates/socialaccount/base.html
+++ b/src/pretalx/sso_provider/templates/socialaccount/base.html
@@ -35,7 +35,6 @@
         {% else %}
             {% compress css %}
                 <link rel="stylesheet" type="text/css" href="{% static "vendored/fullcalendar/fullcalendar.min.css" %}"/>
-                <link rel="stylesheet" type="text/x-scss" href="{% static "agenda/scss/main.scss" %}" />
             {% endcompress %}
         {% endif %}
         {% if request.event and request.event.custom_css %}<link rel="stylesheet" type="text/css" href="{{ request.event.custom_css.url }}"/>{% endif %}
diff --git a/src/tests/agenda/views/test_agenda_talks.py b/src/tests/agenda/views/test_agenda_talks.py
index da1039678..de1c0d0a1 100644
--- a/src/tests/agenda/views/test_agenda_talks.py
+++ b/src/tests/agenda/views/test_agenda_talks.py
@@ -16,7 +16,7 @@ def test_can_see_talk_list(client, django_assert_num_queries, event, slot, other
 
 @pytest.mark.django_db
 def test_can_see_talk(client, django_assert_num_queries, event, slot, other_slot):
-    with django_assert_num_queries(20):
+    with django_assert_num_queries(21):
         response = client.get(slot.submission.urls.public, follow=True)
     with scope(event=event):
         assert event.schedules.count() == 2
@@ -69,7 +69,6 @@ def test_orga_can_see_new_talk(
         assert formats.date_format(slot.local_end, "H:i") in content
         assert str(slot.room.name) in content
         assert "fa-edit" not in content  # edit btn
-        assert "fa-video" not in content  # do not record
 
 
 @pytest.mark.django_db
@@ -82,7 +81,6 @@ def test_can_see_talk_edit_btn(
     assert response.status_code == 200
     content = response.content.decode()
     assert "fa-edit" in content  # edit btn
-    assert "fa-video" not in content
 
 
 @pytest.mark.django_db
@@ -110,7 +108,6 @@ def test_can_see_talk_does_accept_feedback(
     content = response.content.decode()
     assert "fa-edit" not in content  # edit btn
     assert "fa-comments" in content
-    assert "fa-video" not in content
 
 
 @pytest.mark.django_db
diff --git a/src/tests/orga/test_orga_auth.py b/src/tests/orga/test_orga_auth.py
index 67f800c77..0c47203d9 100644
--- a/src/tests/orga/test_orga_auth.py
+++ b/src/tests/orga/test_orga_auth.py
@@ -178,44 +178,6 @@ def test_orga_incorrect_invite_token(client, event, invitation):
     assert response.status_code == 404
 
 
-@pytest.mark.django_db
-def test_can_reset_password_by_email(orga_user, client, event):
-    djmail.outbox = []
-    response = client.post(
-        "/orga/reset/", data={"login_email": orga_user.email}, follow=True
-    )
-    orga_user.refresh_from_db()
-    reset_token = orga_user.pw_reset_token
-    assert response.status_code == 200
-    assert reset_token
-    assert len(djmail.outbox) == 1
-
-    # Make sure we can do this only once
-    response = client.post(
-        "/orga/reset/", data={"login_email": orga_user.email}, follow=True
-    )
-    orga_user.refresh_from_db()
-    assert response.status_code == 200
-    assert orga_user.pw_reset_token
-    assert orga_user.pw_reset_token == reset_token
-    assert len(djmail.outbox) == 1
-
-    response = client.post(
-        f"/orga/reset/{orga_user.pw_reset_token}",
-        data={"password": "mynewpassword1!", "password_repeat": "mynewpassword1!"},
-        follow=True,
-    )
-    assert response.status_code == 200
-    orga_user.refresh_from_db()
-    assert not orga_user.pw_reset_token
-    response = client.post(
-        event.urls.login,
-        data={"login_email": orga_user.email, "login_password": "mynewpassword1!"},
-        follow=True,
-    )
-    assert orga_user.get_display_name() in response.content.decode()
-
-
 @pytest.mark.django_db
 def test_cannot_use_incorrect_token(orga_user, client, event):
     response = client.post(
diff --git a/src/tests/orga/views/test_orga_views_cfp.py b/src/tests/orga/views/test_orga_views_cfp.py
index 73021008f..aa102d76d 100644
--- a/src/tests/orga/views/test_orga_views_cfp.py
+++ b/src/tests/orga/views/test_orga_views_cfp.py
@@ -76,28 +76,6 @@ def test_edit_cfp_flow(orga_client, event):
     assert response.status_code == 200, response.content.decode()
 
 
-@pytest.mark.django_db
-def test_edit_cfp_flow_shows_in_frontend(orga_client, event):
-    with scope(event=event):
-        new_config = event.cfp_flow.get_editor_config(json_compat=True)
-
-    new_config[0]["title"]["en"] = "TEST CFP WOO"
-    new_config[0]["text"]["en"] = "PLS SUBMIT HERE THX"
-    new_config[0]["fields"][0]["help_text"]["en"] = "titles are hard, y'know"
-    response = orga_client.post(
-        event.cfp.urls.editor,
-        new_config,
-        content_type="application/json",
-    )
-    assert response.status_code == 200, response.content.decode()
-
-    response = orga_client.get(event.cfp.urls.submit, follow=True)
-    assert response.status_code == 200
-    assert "TEST CFP WOO" in response.content.decode()
-    assert "PLS SUBMIT HERE THX" in response.content.decode()
-    assert "titles are hard, y'know" in response.content.decode()
-
-
 @pytest.mark.django_db
 def test_make_submission_type_default(
     orga_client, submission_type, default_submission_type