diff --git a/main/admin/extra_field_options.php b/main/admin/extra_field_options.php
index 5ed2a9e628..65a29f5909 100644
--- a/main/admin/extra_field_options.php
+++ b/main/admin/extra_field_options.php
@@ -15,13 +15,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 
-if ($type == 'question') {
-    if (!(api_is_platform_admin() || api_is_question_manager())) {
-        api_not_allowed(true);
-    }
-} else {
-    api_protect_admin_script();
-}
+api_protect_admin_script();
 
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
diff --git a/main/admin/extra_field_workflow.php b/main/admin/extra_field_workflow.php
index 92beb00075..8d59736362 100644
--- a/main/admin/extra_field_workflow.php
+++ b/main/admin/extra_field_workflow.php
@@ -15,13 +15,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 
 $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 
-if ($type == 'question') {
-    if (!(api_is_platform_admin() || api_is_question_manager())) {
-        api_not_allowed(true);
-    }
-} else {
-    api_protect_admin_script();
-}
+api_protect_admin_script();
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
diff --git a/main/admin/extra_fields.php b/main/admin/extra_fields.php
index a0b1fd3c27..fd88dddb54 100644
--- a/main/admin/extra_fields.php
+++ b/main/admin/extra_fields.php
@@ -14,13 +14,7 @@ require_once '../inc/global.inc.php';
 $extraFieldType =  isset($_REQUEST['type']) ? $_REQUEST['type'] : null;
 
 $this_section = SECTION_PLATFORM_ADMIN;
-if ($extraFieldType == 'question') {
-    if (!(api_is_platform_admin() || api_is_question_manager())) {
-        api_not_allowed(true);
-    }
-} else {
-    api_protect_admin_script();
-}
+api_protect_admin_script();
 
 //Add the JS needed to use the jqgrid
 $htmlHeadXtra[] = api_get_jqgrid_js();
diff --git a/main/admin/index.php b/main/admin/index.php
index 8536cd9c08..3083770b10 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -10,11 +10,6 @@
 
 // Language files that need to be included.
 $language_file = array('admin', 'tracking','coursebackup');
-/*
-if (api_is_question_manager()) {
-    header('Location: '.api_get_path(WEB_PUBLIC_PATH).'admin/questionmanager');
-    exit;
-}*/
 
 // Setting the section (for the tabs).
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/inc/services.php b/main/inc/services.php
index 8f4a65fa82..b5795b2a8c 100644
--- a/main/inc/services.php
+++ b/main/inc/services.php
@@ -104,9 +104,9 @@ $app['security.role_hierarchy'] = array(
 $app['security.access_rules'] = array(
     //array('^/admin', 'ROLE_ADMIN', 'https'),
     array('^/admin/administrator', 'ROLE_ADMIN'),
-    array('^/main/admin/extra_fields.php', 'ROLE_QUESTION_MANAGER'),
-    array('^/main/admin/extra_field_options.php', 'ROLE_QUESTION_MANAGER'),
-    array('^/main/admin/extra_field_workflow.php', 'ROLE_QUESTION_MANAGER'),
+    //array('^/main/admin/extra_fields.php', 'ROLE_QUESTION_MANAGER'),
+    //array('^/main/admin/extra_field_options.php', 'ROLE_QUESTION_MANAGER'),
+    //array('^/main/admin/extra_field_workflow.php', 'ROLE_QUESTION_MANAGER'),
     array('^/main/admin/.*', 'ROLE_ADMIN'),
     array('^/admin/questionmanager', 'ROLE_QUESTION_MANAGER'),
     array('^/main/.*', array('ROLE_STUDENT'))
diff --git a/main/template/default/admin/questionmanager/questionmanager.tpl b/main/template/default/admin/questionmanager/questionmanager.tpl
index 979ec10789..b0d97cd4e0 100644
--- a/main/template/default/admin/questionmanager/questionmanager.tpl
+++ b/main/template/default/admin/questionmanager/questionmanager.tpl
@@ -9,7 +9,6 @@
                         <a href="{{ url('admin_questions') }}">
                         {{ 'Questions' | get_lang }}</a>
                     </li>
-                    <li><a href="{{ _p.web }}main/admin/extra_fields.php?type=question">{{ 'ExtraFields' | get_lang }}</a></li>
                     <li><a href="{{ url('admin_category_new')}}">{{ 'AddACategory' | get_lang }}</a></li>
                 </ul>