diff --git a/main/inc/lib/security.lib.php b/main/inc/lib/security.lib.php
index e4a27f5531..574133ed10 100644
--- a/main/inc/lib/security.lib.php
+++ b/main/inc/lib/security.lib.php
@@ -50,7 +50,7 @@ class Security {
 
         $true_path = str_replace("\\", '/', realpath($abs_path));
         $checker_path = str_replace("\\", '/', realpath($checker_path));
-        
+
         $found = strpos($true_path.'/', $checker_path);
 
         if ($found === 0) {
@@ -103,7 +103,8 @@ class Security {
      * @param   string  Unfiltered filename
      * @param   string  Filtered filename
      */
-    public static function filter_filename($filename) {
+    public static function filter_filename($filename)
+    {
         require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
         return disable_dangerous_file($filename);
     }
@@ -114,7 +115,8 @@ class Security {
      * @param	string	The array in which to get the token ('get' or 'post')
      * @return	bool	True if it's the right token, false otherwise
      */
-    public static function check_token($request_type = 'post') {
+    public static function check_token($request_type = 'post')
+    {
         switch ($request_type) {
             case 'request':
                 if (isset($_SESSION['sec_token']) && isset($_REQUEST['sec_token']) && $_SESSION['sec_token'] === $_REQUEST['sec_token']) {
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 2742f1f46f..0a5dc086cd 100644
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -2306,19 +2306,12 @@ class SessionManager
                                     $course_coaches = array_merge($course_coaches, $teachersToAdd);
                                 }
 
-
                                 foreach ($course_coaches as $course_coach) {
                                     $course_coach = trim($course_coach);
                                     $coach_id = UserManager::get_user_id_from_username($course_coach);
                                     if ($coach_id !== false) {
                                         // Just insert new coaches
                                         SessionManager::updateCoaches($session_id, $course_code, array($coach_id), false);
-                                        /*$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
-                                                id_user = '$coach_id',
-                                                course_code = '$course_code',
-                                                id_session = '$session_id',
-                                                status = 2 ";
-                                        Database::query($sql);*/
 
                                         if ($debug) {
                                             $logger->addInfo("Sessions - Adding course coach: user #$coach_id ($course_coach) to course: '$course_code' and session #$session_id");
@@ -2331,33 +2324,21 @@ class SessionManager
                             }
                         }
 
-                        //$users_in_course_counter = 0;
-
                         // Adding Students, updating relationship "Session - Course - User".
-
                         foreach ($course_users as $user) {
                             $user = trim($user);
                             $user_id = UserManager::get_user_id_from_username($user);
 
                             if ($user_id !== false) {
                                 SessionManager::subscribe_users_to_session_course(array($user_id), $session_id, $course_code);
-                                /*$sql = "INSERT IGNORE INTO $tbl_session_course_user SET
-                                        id_user='$user_id',
-                                        course_code='$course_code',
-                                        id_session = '$session_id'";
-                                Database::query($sql);*/
                                 if ($debug) {
                                     $logger->addInfo("Sessions - Adding student: user #$user_id ($user) to course: '$course_code' and session #$session_id");
                                 }
-                                //$users_in_course_counter++;
                             } else {
                                 $error_message .= get_lang('UserDoesNotExist').': '.$user.$eol;
                             }
                         }
 
-                        /*$sql = "UPDATE $tbl_session_course SET nbr_users = '$users_in_course_counter' WHERE course_code = '$course_code'";
-                        Database::query($sql);*/
-
                         $course_info = CourseManager::get_course_information($course_code);
                         $inserted_in_course[$course_code] = $course_info['title'];
                     }
diff --git a/main/mySpace/student.php b/main/mySpace/student.php
index e0e73f6f51..c1f025ca5a 100644
--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@@ -94,12 +94,11 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
 			}
 		}
 
-		//if (count($students) > 0) {		//
-			echo '<span style="float:right">';
-			echo Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), 32), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
-			echo Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), 32), api_get_self().'?export=csv');
-			echo '</span>';
-		//}
+        echo '<span style="float:right">';
+        echo Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), 32), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
+        echo Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), 32), api_get_self().'?export=csv');
+        echo '</span>';
+
 		echo '</div>';
 	} else {
 		echo '<div class="actions"><div style="float:right;">
@@ -149,7 +148,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
 				$students = array_keys(UserManager::get_users_followed_by_drh(api_get_user_id() , STUDENT));
 			}
 
-			$courses_of_the_platform = CourseManager :: get_real_course_list();
+			$courses_of_the_platform = CourseManager::get_real_course_list();
 			foreach ($courses_of_the_platform as $course) {
 				$courses[$course['code']] = $course['code'];
 			}
@@ -272,10 +271,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
                     $detailsLink = Display::return_icon('2rightarrow_na.gif', get_lang('Details'));
                 }
             }
-
             $row[] = $detailsLink;
-
-
             $all_datas[] = $row;
 		}