diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index fd633ac10a..a799dcc64e 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -7294,21 +7294,20 @@ class Exercise
 
             if (!empty($questions_in_media)) {
                 $count_of_questions_inside_media = count($questions_in_media);
-                if ($count_of_questions_inside_media > 1) {
-                    if (api_is_allowed_to_session_edit()) {
-                        $button = [
-                            Display::button(
-                                'save_now',
-                                get_lang('SaveForNow'),
-                                ['type' => 'button', 'class' => 'btn btn-primary', 'data-question' => $questionId]
-                            ),
-                            '<span id="save_for_now_'.$questionId.'" class="exercise_save_mini_message"></span>&nbsp;',
-                        ];
-                        $exercise_actions = Display::div(
-                            implode(PHP_EOL, $button),
-                            ['class' => 'exercise_save_now_button']
-                        );
-                    }
+                if ($count_of_questions_inside_media > 1 && api_is_allowed_to_session_edit()) {
+                    $button = [
+                        Display::button(
+                            'save_now',
+                            get_lang('SaveForNow'),
+                            ['type' => 'button', 'class' => 'btn btn-primary', 'data-question' => $questionId]
+                        ),
+                        '<span id="save_for_now_'.$questionId.'" class="exercise_save_mini_message"></span>&nbsp;',
+                    ];
+                    $exercise_actions = Display::div(
+                        implode(PHP_EOL, $button),
+                        ['class' => 'exercise_save_now_button']
+                    );
+
                 }
 
                 if ($last_question_in_media && $this->type == ONE_PER_PAGE) {
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 14a0848934..01859ca8ba 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -3464,10 +3464,6 @@ function api_is_allowed_to_session_edit($tutor = false, $coach = false)
             // Get the session visibility
             $session_visibility = api_get_session_visibility($sessionId);
             // if 5 the session is still available
-            //@todo We could load the session_rel_course_rel_user permission to increase the level of detail.
-            //echo api_get_user_id();
-            //echo api_get_course_id();
-
             switch ($session_visibility) {
                 case SESSION_VISIBLE_READ_ONLY: // 1
                     return false;