diff --git a/calendar/classes/external/calendar_event_exporter.php b/calendar/classes/external/calendar_event_exporter.php
index e3b53a9afb1..31863901b8a 100644
--- a/calendar/classes/external/calendar_event_exporter.php
+++ b/calendar/classes/external/calendar_event_exporter.php
@@ -26,9 +26,6 @@ namespace core_calendar\external;
 
 defined('MOODLE_INTERNAL') || die();
 
-use \core\external\exporter;
-use \core_calendar\local\event\entities\event_interface;
-use \core_calendar\local\event\entities\action_event_interface;
 use \core_course\external\course_summary_exporter;
 use \renderer_base;
 
diff --git a/calendar/classes/external/day_name_exporter.php b/calendar/classes/external/day_name_exporter.php
index 665cc55df50..41c657f4f35 100644
--- a/calendar/classes/external/day_name_exporter.php
+++ b/calendar/classes/external/day_name_exporter.php
@@ -27,8 +27,6 @@ namespace core_calendar\external;
 defined('MOODLE_INTERNAL') || die();
 
 use core\external\exporter;
-use renderer_base;
-use moodle_url;
 
 /**
  * Class for displaying the day view.
diff --git a/calendar/classes/external/event_exporter.php b/calendar/classes/external/event_exporter.php
index e20b43e2210..7e4bb7c531d 100644
--- a/calendar/classes/external/event_exporter.php
+++ b/calendar/classes/external/event_exporter.php
@@ -26,11 +26,8 @@ namespace core_calendar\external;
 
 defined('MOODLE_INTERNAL') || die();
 
-
 require_once($CFG->dirroot . "/calendar/lib.php");
 
-use \core\external\exporter;
-use \core_calendar\local\event\entities\event_interface;
 use \core_calendar\local\event\entities\action_event_interface;
 use \core_calendar\local\event\container;
 use \core_course\external\course_summary_exporter;
diff --git a/calendar/classes/external/footer_options_exporter.php b/calendar/classes/external/footer_options_exporter.php
index a5e6e4df798..018970a195c 100644
--- a/calendar/classes/external/footer_options_exporter.php
+++ b/calendar/classes/external/footer_options_exporter.php
@@ -117,7 +117,7 @@ class footer_options_exporter extends exporter {
             $exportbutton = $this->get_export_calendar_button();
             $values->exportcalendarbutton = $exportbutton->export_for_template($output);
             $values->managesubscriptionbutton = $this->get_manage_subscriptions_button($output);
-            $values->icalurl = $this->get_ical_url($output)->out(false);
+            $values->icalurl = $this->get_ical_url()->out(false);
         }
 
         return (array) $values;
diff --git a/calendar/classes/external/week_exporter.php b/calendar/classes/external/week_exporter.php
index c7412800d3d..afc92b2f012 100644
--- a/calendar/classes/external/week_exporter.php
+++ b/calendar/classes/external/week_exporter.php
@@ -28,7 +28,6 @@ defined('MOODLE_INTERNAL') || die();
 
 use core\external\exporter;
 use renderer_base;
-use moodle_url;
 
 /**
  * Class for displaying the week view.
diff --git a/version.php b/version.php
index d475fe8a5db..fa054589d5e 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-
 $version  = 2017081000.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.