diff --git a/app/controllers/avatar.php b/app/controllers/avatar.php
index ef289ee6d330e5e1bb6a133d3052e03d3f3401b1..992c06e1fa2641a5666179f28045939ab7392004 100644
--- a/app/controllers/avatar.php
+++ b/app/controllers/avatar.php
@@ -27,7 +27,6 @@ class AvatarController extends AuthenticatedController
         if ($type == 'user') {
             PageLayout::setHelpKeyword('Basis.HomepageBild');
             PageLayout::setTitle(_('Profilbild ändern'));
-            SkipLinks::addIndex(_('Profilbild ändern'), 'edit_avatar');
 
             $has_perm = $GLOBALS['perm']->have_profile_perm('user', $id);
             $class = 'Avatar';
@@ -70,7 +69,6 @@ class AvatarController extends AuthenticatedController
         $this->avatar = $avatar->getURL($class::NORMAL);
         if ($avatar->is_customized()) {
             $this->customized = true;
-            SkipLinks::addIndex(_('Bild löschen'), 'delete_picture');
         }
 
         $this->type = $type;
diff --git a/app/controllers/course/details.php b/app/controllers/course/details.php
index aec496fcc55ec6929de4c7935b6a785e74c48e2b..bcd4f54172db9b5dc5196818f91285600d97e454 100644
--- a/app/controllers/course/details.php
+++ b/app/controllers/course/details.php
@@ -205,7 +205,6 @@ class Course_DetailsController extends AuthenticatedController
 
             if ($GLOBALS['SessionSeminar'] === $this->course->id) {
                 Navigation::activateItem('/course/main/details');
-                SkipLinks::addIndex(Navigation::getItem('/course/main/details')->getTitle(), 'main_content', 100);
             } else {
                 $sidebarlink = true;
                 $enrolment_info = $this->sem->getEnrolmentInfo($GLOBALS['user']->id);
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 1edf2c9c047c0bf7a9162f9aac71a91bf59c1606..08562c0970f3b70df347a150dc8c57cb01b984cd 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -58,9 +58,6 @@ class Course_MembersController extends AuthenticatedController
         // Layoutsettings
         PageLayout::setTitle(sprintf('%s - %s', Course::findCurrent()->getFullname(), _("Teilnehmende")));
 
-        SkipLinks::addIndex(Navigation::getItem('/course/members')->getTitle(), 'main_content', 100);
-
-
         $this->studip_module = checkObjectModule('participants');
         object_set_visit_module( $this->studip_module->getPluginId());
         $this->last_visitdate = object_get_visit($this->course_id, $this->studip_module->getPluginId());
@@ -125,7 +122,6 @@ class Course_MembersController extends AuthenticatedController
 
         // Check autor-perms
         if (!$this->is_tutor) {
-            SkipLinks::addIndex(_("Sichtbarkeit ändern"), 'change_visibility');
             // filter invisible user
             $this->invisibles = count($filtered_members['autor']->findBy('visible', 'no')) + count($filtered_members['user']->findBy('visible', 'no'));
             $current_user_id = $this->user_id;
diff --git a/app/controllers/course/overview.php b/app/controllers/course/overview.php
index 3a2332ffac6aeecce0ec97b962e3fcc9f2aafd0b..1977ed42adf9633a3e7d548d6cea125d3ae5144e 100644
--- a/app/controllers/course/overview.php
+++ b/app/controllers/course/overview.php
@@ -31,8 +31,6 @@ class Course_OverviewController extends AuthenticatedController
         PageLayout::setHelpKeyword('Basis.InVeranstaltungKurzinfo');
         PageLayout::setTitle(Context::getHeaderLine() . ' - ' . _('Kurzinfo'));
         Navigation::activateItem('/course/main/info');
-        // add skip link
-        SkipLinks::addIndex(Navigation::getItem('/course/main/info')->getTitle(), 'main_content', 100);
 
         $this->sem             = Seminar::getInstance($this->course_id);
         $sem_class             = $this->sem->getSemClass();
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 5bbd34ac61e9aa6f5b697e331cb3810e3f08c794..8a4f4727c2fa0d369997bcd6d1c4d4fa3dd14daf 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -77,7 +77,6 @@ class MyCoursesController extends AuthenticatedController
         Navigation::activateItem('/browse/my_courses/list');
         PageLayout::setHelpKeyword('Basis.MeineVeranstaltungen');
         PageLayout::setTitle(_('Meine Veranstaltungen'));
-        SkipLinks::addIndex(_('Meine Veranstaltungen'), 'mycourses');
 
         $this->sem_data = Semester::getAllAsArray();
 
@@ -636,7 +635,6 @@ class MyCoursesController extends AuthenticatedController
         PageLayout::setTitle(_('Meine archivierten Veranstaltungen'));
         PageLayout::setHelpKeyword('Basis.MeinArchiv');
         Navigation::activateItem('/browse/my_courses/archive');
-        SkipLinks::addIndex(_('Hauptinhalt'), 'layout_content', 100);
 
         if (Config::get()->ENABLE_ARCHIVE_SEARCH) {
             $actions = Sidebar::get()->addWidget(new ActionsWidget());
diff --git a/app/controllers/notifications.php b/app/controllers/notifications.php
index 78fa884ae8dad5cd2c97060e95044c1464540e60..b206df1b291c67904a25eba330bf7565212eaab4 100644
--- a/app/controllers/notifications.php
+++ b/app/controllers/notifications.php
@@ -31,7 +31,6 @@ class NotificationsController extends AuthenticatedController
         //PageLayout::setHelpKeyword('Basis.InteraktionWhosOnline');
         PageLayout::setTitle(_('Persönliche Benachrichtigungen'));
         Navigation::activateItem('/messaging');
-        SkipLinks::addIndex(_('Wer ist online?'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/online.php b/app/controllers/online.php
index 8807ce18ac2e9c6626830bc0cdd1ca1e24a706ab..0407cb71072dbfd39c20928abf8cadfa36fbb34c 100644
--- a/app/controllers/online.php
+++ b/app/controllers/online.php
@@ -28,7 +28,6 @@ class OnlineController extends AuthenticatedController
         PageLayout::setHelpKeyword('Basis.InteraktionWhosOnline');
         PageLayout::setTitle(_('Wer ist online?'));
         Navigation::activateItem('/community/online');
-        SkipLinks::addIndex(_('Wer ist online?'), 'layout_content', 100);
 
         $this->settings = $GLOBALS['user']->cfg->MESSAGING_SETTINGS;
 
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index 8592d01aa92ec7243f80f5f561ed37bda463aa18..cf9e1f51f61fa4c505d459423faef28d66154e04 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -27,7 +27,6 @@ class ProfileController extends AuthenticatedController
         Navigation::activateItem('/profile/index');
         URLHelper::addLinkParam('username', Request::username('username'));
         PageLayout::setHelpKeyword('Basis.Homepage');
-        SkipLinks::addIndex(_('Benutzerprofil'), 'layout_content', 100);
 
         $this->user         = User::findCurrent(); // current logged in user
         $this->perm         = $GLOBALS['perm']; // perms of current logged in user
diff --git a/app/controllers/settings/account.php b/app/controllers/settings/account.php
index 818c83e44690136ac0af07ffe7939b43c8b7595b..1de1e0ffa4c544fe97778e7491471c1df1d6032b 100644
--- a/app/controllers/settings/account.php
+++ b/app/controllers/settings/account.php
@@ -31,7 +31,6 @@ class Settings_AccountController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.HomepagePersönlicheDaten');
         PageLayout::setTitle(_('Persönliche Angaben bearbeiten'));
         Navigation::activateItem('/profile/edit/profile');
-        SkipLinks::addIndex(_('Persönliche Angaben bearbeiten'), 'layout_content');
     }
 
     /**
diff --git a/app/controllers/settings/calendar.php b/app/controllers/settings/calendar.php
index 640a8c93e6df615d3347bb0efa1e4342eb13add1..5704246cca1ff41528b955a121c12967bcc39110 100644
--- a/app/controllers/settings/calendar.php
+++ b/app/controllers/settings/calendar.php
@@ -36,7 +36,6 @@ class Settings_CalendarController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.MyStudIPTerminkalender');
         PageLayout::setTitle(_('Einstellungen des Terminkalenders anpassen'));
         Navigation::activateItem('/profile/settings/calendar_new');
-        SkipLinks::addIndex(_('Einstellungen des Terminkalenders anpassen'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/settings/categories.php b/app/controllers/settings/categories.php
index 5715c46883cea31c7c0aeb2327a989491fa38600..f62366498d28a60062ce519ffa5a29362097cb66 100644
--- a/app/controllers/settings/categories.php
+++ b/app/controllers/settings/categories.php
@@ -31,7 +31,6 @@ class Settings_CategoriesController extends Settings_SettingsController
         Navigation::activateItem('/profile/categories');
         PageLayout::setHelpKeyword('Basis.HomepageSonstiges');
         PageLayout::setTitle(_('Eigene Kategorien bearbeiten'));
-        SkipLinks::addIndex(_('Eigene Kategorien bearbeiten'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/settings/deputies.php b/app/controllers/settings/deputies.php
index 0291d08933ec13b045279a45f5b14430e1fc2061..910d93da467ede3b9bf918d883a7fb6c595d2ab2 100644
--- a/app/controllers/settings/deputies.php
+++ b/app/controllers/settings/deputies.php
@@ -31,7 +31,6 @@ class Settings_DeputiesController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.MyStudIPDeputies');
         PageLayout::setTitle(_('Standardvertretung'));
         Navigation::activateItem('/profile/settings/deputies');
-        SkipLinks::addIndex(_('Standardvertretung'), 'main_content', 100);
 
         $this->edit_about_enabled = Config::get()->DEPUTIES_EDIT_ABOUT_ENABLE;
     }
diff --git a/app/controllers/settings/details.php b/app/controllers/settings/details.php
index 9a021a97a486204b7d5e4eb24c253f814092b5fa..5f6f738dda5e273b4da23c806257e141f15f721d 100644
--- a/app/controllers/settings/details.php
+++ b/app/controllers/settings/details.php
@@ -35,7 +35,6 @@ class Settings_DetailsController extends Settings_SettingsController
                              ? _('Lebenslauf, Arbeitsschwerpunkte und Publikationen bearbeiten')
                              : _('Lebenslauf bearbeiten'));
         Navigation::activateItem('/profile/edit/details');
-        SkipLinks::addIndex(_('Private Daten bearbeiten'), 'layout_content');
     }
 
     /**
diff --git a/app/controllers/settings/general.php b/app/controllers/settings/general.php
index e1c783f4b7a5b0dae042a5b92050ab9cd68f5314..bf9879178ec3de138b38cd4b989ddd747cd95865 100644
--- a/app/controllers/settings/general.php
+++ b/app/controllers/settings/general.php
@@ -30,7 +30,12 @@ class Settings_GeneralController extends Settings_SettingsController
 
         PageLayout::setTitle(_('Allgemeine Einstellungen anpassen'));
         Navigation::activateItem('/profile/settings/general');
-        SkipLinks::addIndex(_('Allgemeine Einstellungen anpassen'), 'layout_content', 100);
+        $this->show_room_management_autor_config = Config::get()->RESOURCES_ENABLE
+                                                && (
+                                                    ResourceManager::userHasGlobalPermission($this->user, 'autor')
+                                                    ||
+                                                    RoomManager::userHasRooms($this->user, 'autor')
+                                                );
     }
 
     /**
diff --git a/app/controllers/settings/messaging.php b/app/controllers/settings/messaging.php
index a9af8ac0454d108a3c91a3fc3bc2bd94834a6371..4c249af6a5eb0f3c68ba7e2d7ff156a133bea046 100644
--- a/app/controllers/settings/messaging.php
+++ b/app/controllers/settings/messaging.php
@@ -24,7 +24,6 @@ class Settings_MessagingController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.MyStudIPMessaging');
         PageLayout::setTitle(_('Einstellungen des Nachrichtensystems anpassen'));
         Navigation::activateItem('/profile/settings/messaging');
-        SkipLinks::addIndex(_('Einstellungen des Nachrichtensystems anpassen'), 'layout_content', 100);
 
         $this->settings = $this->config->MESSAGING_SETTINGS;
     }
diff --git a/app/controllers/settings/notification.php b/app/controllers/settings/notification.php
index 12245f3d9fa80d208ccf347e5542de5d01adf57b..cf87f016be9888779b361eacbef33945d9028cee 100644
--- a/app/controllers/settings/notification.php
+++ b/app/controllers/settings/notification.php
@@ -44,7 +44,6 @@ class Settings_NotificationController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.MyStudIPBenachrichtigung');
         PageLayout::setTitle(_('Benachrichtigung über neue Inhalte anpassen'));
         Navigation::activateItem('/profile/settings/notification');
-        SkipLinks::addIndex(_('Benachrichtigung über neue Inhalte anpassen'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/settings/password.php b/app/controllers/settings/password.php
index 6057b91c568babe68ea0c92c0c5b2f775c212c7f..20f7556e7e718d235c8cb380dbff78cf16b8938d 100644
--- a/app/controllers/settings/password.php
+++ b/app/controllers/settings/password.php
@@ -37,7 +37,6 @@ class Settings_PasswordController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.HomepagePersönlicheDaten');
         PageLayout::setTitle(_('Passwort ändern'));
         Navigation::activateItem('profile/edit/password');
-        SkipLinks::addIndex(_('Passwort ändern'), 'layout_content');
     }
 
     /**
diff --git a/app/controllers/settings/privacy.php b/app/controllers/settings/privacy.php
index 7afc87104ce07d425bd1d1e3aa0640c1712ff2f8..1b85abc241ea7c6014933a9de300c9bdcc9c7cfb 100644
--- a/app/controllers/settings/privacy.php
+++ b/app/controllers/settings/privacy.php
@@ -32,8 +32,6 @@ class Settings_PrivacyController extends Settings_SettingsController
         PageLayout::setTitle(_('Privatsphäre'));
 
         Navigation::activateItem('/profile/settings/privacy');
-
-        SkipLinks::addIndex(_('Privatsphäre'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/settings/statusgruppen.php b/app/controllers/settings/statusgruppen.php
index c2438cd83c502dfa723820bc12b774230927dc7a..d7de2546cfc7d278f8affba5e55f961cd2123441 100644
--- a/app/controllers/settings/statusgruppen.php
+++ b/app/controllers/settings/statusgruppen.php
@@ -33,7 +33,6 @@ class Settings_StatusgruppenController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.HomepageUniversitäreDaten');
         PageLayout::setTitle(_('Einrichtungsdaten bearbeiten'));
         Navigation::activateItem('/profile/edit/statusgruppen');
-        SkipLinks::addIndex(_('Einrichtungsdaten bearbeiten'), 'layout_content', 100);
     }
 
     /**
diff --git a/app/controllers/settings/studies.php b/app/controllers/settings/studies.php
index dfba3db12a8bda3ee027dc73b27b1f3fb22ce589..7763aa61211d87b5f2165e9c263e8f91ca35b92d 100644
--- a/app/controllers/settings/studies.php
+++ b/app/controllers/settings/studies.php
@@ -36,8 +36,6 @@ class Settings_StudiesController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.HomepageUniversitäreDaten');
         PageLayout::setTitle(_('Studiengang bearbeiten'));
         Navigation::activateItem('/profile/edit/studies');
-        SkipLinks::addIndex(_('Fächer und Abschlüsse auswählen'), 'select_fach_abschluss');
-        SkipLinks::addIndex(_('Zu Einrichtungen zuordnen'), 'select_institute');
 
         $this->allow_change = [
             'sg' => !StudipAuthAbstract::CheckField('studiengang_id', $this->user->auth_plugin)
diff --git a/app/controllers/settings/userdomains.php b/app/controllers/settings/userdomains.php
index 343003b3f9a18eac8871b0de285b5acd180906b1..eda8bcc659c09d732965ea5b61b3361c751b951e 100644
--- a/app/controllers/settings/userdomains.php
+++ b/app/controllers/settings/userdomains.php
@@ -31,8 +31,6 @@ class Settings_UserdomainsController extends Settings_SettingsController
         PageLayout::setHelpKeyword('Basis.HomepageNutzerdomänen');
         PageLayout::setTitle(_('Nutzerdomänen bearbeiten'));
         Navigation::activateItem('/profile/edit/userdomains');
-        SkipLinks::addIndex(_('Zugeordnete Nutzerdomänen'), 'assigned_userdomains');
-        SkipLinks::addIndex(_('Nutzerdomäne auswählen'), 'select_userdomains');
     }
 
     /**
diff --git a/app/controllers/studygroup.php b/app/controllers/studygroup.php
index a113d2617269d77755c49e41f573b958c609127d..66b20a354b20167d41e4ad1a64a1d3088fa35894 100644
--- a/app/controllers/studygroup.php
+++ b/app/controllers/studygroup.php
@@ -25,13 +25,6 @@ class StudygroupController extends AuthenticatedController
         Navigation::activateItem('/community/studygroups/browse');
         PageLayout::setHelpKeyword('Basis.SuchenStudiengruppen');
 
-        // add skip link
-        SkipLinks::addIndex(
-            Navigation::getItem('/community/studygroups/browse')->getTitle(),
-            'layout_content',
-            100
-        );
-
         $this->setupSidebar();
     }
 
diff --git a/app/views/calendar/group/day.php b/app/views/calendar/group/day.php
index 46758b14cc88719afa6647c1154160c72be5685a..a452320489ad2d264a05333058dc9cb56890af90 100644
--- a/app/views/calendar/group/day.php
+++ b/app/views/calendar/group/day.php
@@ -7,8 +7,6 @@ $width1 = floor(90 / $cells);
 $width2 = 10 + (90 - $width1 * $cells);
 $start = $settings['start'] * 3600;
 $end = ($settings['end'] + 1) * 3600;
-// add skip link
-SkipLinks::addIndex(_('Tagesansicht'), 'main_content', 100);
 ?>
 <table id="main_content" style="width:100%; table-layout:fixed;">
     <thead>
diff --git a/app/views/calendar/group/week.php b/app/views/calendar/group/week.php
index 8f9644a1688fe936711fe8a1119177f6b6341a65..cdac0b5dadca1b4c284c84f3f1086930a04ebf2f 100644
--- a/app/views/calendar/group/week.php
+++ b/app/views/calendar/group/week.php
@@ -5,8 +5,6 @@ $cols = ceil(($settings['end'] - $settings['start'] + 1) * 3600 / $settings['ste
 $start = $settings['start'] * 3600;
 $end = ($settings['end'] + 1) * 3600;
 $wlength = count($calendars[0]) - 1;
-// add skip link
-SkipLinks::addIndex(_('Wochenansicht'), 'main_content', 100);
 ?>
 <table style="width: 100%">
     <tr>
diff --git a/app/views/calendar/single/day.php b/app/views/calendar/single/day.php
index e8f625da25432af00b62ca6d23fd573b53320fd0..721c636a59d5615ba0441207e76a6a58210c2136 100644
--- a/app/views/calendar/single/day.php
+++ b/app/views/calendar/single/day.php
@@ -1,7 +1,3 @@
-<?
-// add skip link
-SkipLinks::addIndex(_('Tagesansicht'), 'layout_content', 100);
-?>
 <div style="width: 100%; display: flex; flex-wrap: wrap;">
     <div style="flex-grow:2; flex-basis: 60%;">
         <?= $this->render_partial('calendar/single/_day'); ?>
diff --git a/app/views/calendar/single/edit.php b/app/views/calendar/single/edit.php
index e8c3eb057a900cf229287b141001851f15809429..f8a2371699a92fa553f9cae3b3a7e294a39e1f2d 100644
--- a/app/views/calendar/single/edit.php
+++ b/app/views/calendar/single/edit.php
@@ -3,8 +3,6 @@
     <? foreach (PageLayout::getMessages() as $messagebox) : ?>
         <?= $messagebox ?>
     <? endforeach ?>
-<? else : ?>
-    <? SkipLinks::addIndex(_('Termine anlegen/bearbeiten'), 'main_content', 100); ?>
 <? endif; ?>
 <form data-dialog="" method="post" action="<?= $controller->url_for($base . 'edit/' . $range_id . '/' . $event->event_id) ?>" class="default collapsable">
     <?= CSRFProtection::tokenTag() ?>
diff --git a/app/views/calendar/single/export_calendar.php b/app/views/calendar/single/export_calendar.php
index 270e20eb106d0dba3e204c07c5ce5f0fcb28f2cd..66f86c5dbb6ea0259a053a54b03882211ad0388b 100644
--- a/app/views/calendar/single/export_calendar.php
+++ b/app/views/calendar/single/export_calendar.php
@@ -3,8 +3,6 @@
     <? foreach (PageLayout::getMessages() as $messagebox) : ?>
         <?= $messagebox ?>
     <? endforeach ?>
-<? else : ?>
-    <? SkipLinks::addIndex(_('Termine exportieren'), 'main_content', 100); ?>
 <? endif; ?>
 <form action="<?= $controller->url_for('calendar/single/export_calendar/' . $calendar->getRangeId(), ['atime' => $atime, 'last_view' => $last_view]) ?>" method="post" name="sync_form" id="calendar_sync" class="default">
     <fieldset>
diff --git a/app/views/calendar/single/import.php b/app/views/calendar/single/import.php
index a63104cdf192f35ccb66ca3937b2f9f19e0ecf57..db1feb3feccc2ced0e70043bd85cc50f31e4748f 100644
--- a/app/views/calendar/single/import.php
+++ b/app/views/calendar/single/import.php
@@ -1,6 +1,5 @@
 <?
 use Studip\Button, Studip\LinkButton;
-SkipLinks::addIndex(_('Termine importieren'), 'main_content', 100);
 ?>
 <form action="<?= $controller->link_for('calendar/single/import/' . $calendar->getRangeId(), ['atime' => $atime, 'last_view' => $last_view]) ?>" method="post" enctype="multipart/form-data" class="default">
     <input type="hidden" name="studip_ticket" value="<?= get_ticket() ?>">
diff --git a/app/views/calendar/single/share.php b/app/views/calendar/single/share.php
index 5a6c33bf8667b9d0c131d5a5200a9fabd78b9908..eef5ca3086e2aa66e1fdd40821320fb3abcd5dbc 100644
--- a/app/views/calendar/single/share.php
+++ b/app/views/calendar/single/share.php
@@ -3,8 +3,6 @@
     <? foreach (PageLayout::getMessages() as $messagebox) : ?>
         <?= $messagebox ?>
     <? endforeach ?>
-<? else : ?>
-    <? SkipLinks::addIndex(_('Kalender teilen'), 'main_content', 100); ?>
 <? endif; ?>
 <form data-dialog="size=auto" action="<?= $controller->url_for('calendar/single/share/' . $calendar->getRangeId()) ?>" method="post" class="default">
     <input type="hidden" name="studip_ticket" value="<?= get_ticket() ?>">
diff --git a/app/views/calendar/single/week.php b/app/views/calendar/single/week.php
index c3c98e1fc79b9a9cb65ad801ce48a9ed654f0c42..d3f6f3ab5e2355a93ecabd229ccaa7b711c890e7 100644
--- a/app/views/calendar/single/week.php
+++ b/app/views/calendar/single/week.php
@@ -1,6 +1,4 @@
 <?
-// add skip link
-SkipLinks::addIndex(_('Wochenansicht'), 'layout_content', 100);
 $at = date('G', $atime);
 if ($at >= $settings['start']
     && $at <= $settings['end'] || !$atime) {
diff --git a/app/views/institute/members/index.php b/app/views/institute/members/index.php
index a0b2854efe833d8659ad2a8449b466d9e003531b..17dc60236d54287db8133c763f73f3187ba60f51 100644
--- a/app/views/institute/members/index.php
+++ b/app/views/institute/members/index.php
@@ -1,7 +1,3 @@
-<?php
-SkipLinks::addIndex(_('Mitarbeiterliste'), 'list_institute_members');    
-?>
-
 <? if ($institute): ?>
     <table class="default" id="list_institute_members">
         <caption><?= _('Mitarbeiterinnen und Mitarbeiter') ?></caption>
diff --git a/app/views/my_courses/_deputy_bosses.php b/app/views/my_courses/_deputy_bosses.php
index f85ae1c3b5516885962f5eff6c4a7f72c5228681..eca6c470e8a497f599630bf1bcb7dbb55cf9c6ab 100644
--- a/app/views/my_courses/_deputy_bosses.php
+++ b/app/views/my_courses/_deputy_bosses.php
@@ -1,4 +1,3 @@
-<? SkipLinks::addIndex(_('Personen, deren Standardvertretung ich bin'), 'my_deputy_bosses') ?>
 <table class="default" id="my_deputy_bosses">
     <caption>
         <?= _('Personen, deren Standardvertretung ich bin') ?>
diff --git a/app/views/my_courses/waiting_list.php b/app/views/my_courses/waiting_list.php
index 7ed91249c8aaddcb882d3e6c0e14f7c65f0575be..ae93da9ea27c1ab9a9ee6932706d3d609abbd18f 100644
--- a/app/views/my_courses/waiting_list.php
+++ b/app/views/my_courses/waiting_list.php
@@ -1,4 +1,3 @@
-<? SkipLinks::addIndex(_("Wartelisten"), 'my_waitlists') ?>
 <table class="default collapsable" id="my_waitlists">
     <caption>
         <?= _("Anmelde- und Wartelisteneinträge") ?>
diff --git a/app/views/my_institutes/index.php b/app/views/my_institutes/index.php
index 53c8b1de1184466ef120a4cbc348a5c6f830f05b..c92309aa0ee8d20826f8a162769f87a38fc28746 100644
--- a/app/views/my_institutes/index.php
+++ b/app/views/my_institutes/index.php
@@ -21,7 +21,6 @@
            auf Ihrer persönlichen Einstellungsseite.'), '<a href="' . URLHelper::getLink('dispatch.php/settings/studies#einrichtungen') . '">', '</a>'))?>
     <? endif ?>
 <? else : ?>
-    <? SkipLinks::addIndex(_('Meine Einrichtungen'), 'my_institutes') ?>
     <table class="default" id="my_institutes">
         <caption><?= _('Meine Einrichtungen') ?></caption>
         <colgroup>
diff --git a/lib/classes/SemBrowse.class.php b/lib/classes/SemBrowse.class.php
index fe05bba35d396a2a60f92509cca2e6f547403cc4..a60201a9c7a0e8f5213bcf2783b51ef9f69e2bbb 100644
--- a/lib/classes/SemBrowse.class.php
+++ b/lib/classes/SemBrowse.class.php
@@ -372,7 +372,6 @@ class SemBrowse {
     {
         ob_start();
 
-        SkipLinks::addIndex(_('Gefundene Bereiche'), 'sem_search_level', 110);
         echo "\n" . '<table id="sem_search_level" class="course-search" width="100%">' . "\n";
         if ($this->sem_browse_data['level'] == 'vv') {
             echo "\n" . '<caption class="legend">'._('Studienbereiche').'<caption>';
@@ -412,8 +411,6 @@ class SemBrowse {
             }
             $the_tree = $this->sem_tree->tree;
 
-            SkipLinks::addIndex(_('Suchergebnis'), 'sem_search_result', 90);
-
             list($group_by_data, $sem_data) = $this->get_result();
 
             $visibles = $sem_data;
diff --git a/public/wiki.php b/public/wiki.php
index 269743cf7d2cff1120b1381caba7e6cce2976482..548a45df11583f22e81a5e94e84f91571375bb0a 100644
--- a/public/wiki.php
+++ b/public/wiki.php
@@ -93,42 +93,36 @@ if ($view === 'listall') {
     //
     // list all pages, default sorting = alphabetically
     //
-    SkipLinks::addIndex(_('Alle Seiten'), 'main_content', 100);
     listPages('all', Request::option('sortby'));
 
 } else if ($view === 'listnew') {
     //
     // list new pages, default sorting = newest first
     //
-    SkipLinks::addIndex(_('Neue Seiten'), 'main_content', 100);
     listPages('new', Request::option('sortby'));
 
 } else if ($view === 'diff') {
     //
     // show one large diff-file containing all changes
     //
-    SkipLinks::addIndex(_('Seite mit Änderungen'), 'main_content', 100);
     showDiffs($keyword, Request::option('versionssince'));
 
 } else if ($view === 'combodiff') {
     //
     // show one large diff-file containing all changes
     //
-    SkipLinks::addIndex(_('Seite mit Änderungen'), 'main_content', 100);
     showComboDiff($keyword);
 
 } else if ($view === 'pageversions') {
     //
     // show versions of a wiki page
     //
-    SkipLinks::addIndex(_('Versionen dieser Seite'), 'main_content', 100);
     listPageVersions($keyword, Request::option('sortby'));
 
 } else if ($view === 'export') {
     //
     // show export dialog
     //
-    SkipLinks::addIndex(_('Seiten exportieren'), 'wiki_export', 100);
     exportWiki();
 
 } else if ($view === 'search') {
@@ -150,8 +144,6 @@ if ($view === 'listall') {
         throw new AccessDeniedException(_('Sie haben keine Berechtigung, Seiten zu editieren!'));
     }
 
-    SkipLinks::addIndex(_('Seite bearbeiten'), 'main_content', 100);
-
     // set lock
     setWikiLock(null, $user->id, Context::getId(), $keyword);
 
@@ -245,7 +237,6 @@ if ($view === 'listall') {
     //
     // Show Page
     //
-    SkipLinks::addIndex(_('Aktuelle Seite'), 'main_content', 100);
 
     $page = WikiPage::findLatestPage(Context::getId(), $keyword);
     if (!$page || $page->isVisibleTo($GLOBALS['user']->id)) {
diff --git a/templates/sembrowse/extended-search.php b/templates/sembrowse/extended-search.php
index 87c3cad0631f954f6645fc6573c70f36e0bc2512..e5089f52682994d0e95f00a495fb5ed902382265 100644
--- a/templates/sembrowse/extended-search.php
+++ b/templates/sembrowse/extended-search.php
@@ -1,13 +1,3 @@
-<?php
-SkipLinks::addIndex(_('Suchformular'), 'search_sem_xts', 100);
-// add skip link for simple search here
-SkipLinks::addLink(
-    _('Schnellsuche'),
-    URLHelper::getURL('dispatch.php/search/courses', ['cmd' => 'qs', 'level' => 'f']),
-    120
-);
-?>
-
 <?= $search_obj->getFormStart(URLHelper::getLink('?send=yes'), ['class' => 'default']) ?>
 
 <fieldset>
diff --git a/templates/sembrowse/quick-search.php b/templates/sembrowse/quick-search.php
index 5afe3e718054a1cd8e6f2413fc2efb960fb9403d..dbf6e2f987f30bb04eba5ce01bbad6bd7f612dbf 100644
--- a/templates/sembrowse/quick-search.php
+++ b/templates/sembrowse/quick-search.php
@@ -1,7 +1,3 @@
-<?php
-SkipLinks::addIndex(_('Suchformular'), 'search_sem_qs', 100);
-?>
-
 <?= $search_obj->getFormStart(URLHelper::getLink(), ['class' => 'default']) ?>
 
 <fieldset>