diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js
index ef88c1d1..4c7d1020 100644
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -12,14 +12,6 @@ const digest = require("digest-fetch");
 const https = require("https");
 const base64 = require("base-64");
 
-/**
- * Moment date
- *
- * @external Moment
- * @see {@link http://momentjs.com}
- */
-const moment = require("moment");
-
 /**
  *
  * @param {string} url The url of the calendar to fetch
@@ -33,8 +25,6 @@ const moment = require("moment");
  * @class
  */
 const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, includePastEvents, selfSignedCert) {
-	const self = this;
-
 	let reloadTimer = null;
 	let events = [];
 
@@ -44,7 +34,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 	/**
 	 * Initiates calendar fetch.
 	 */
-	const fetchCalendar = function () {
+	const fetchCalendar = () => {
 		clearTimeout(reloadTimer);
 		reloadTimer = null;
 		const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
@@ -102,7 +92,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 					scheduleTimer();
 					return;
 				}
-				self.broadcastEvents();
+				this.broadcastEvents();
 				scheduleTimer();
 			});
 	};
@@ -131,7 +121,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 	 */
 	this.broadcastEvents = function () {
 		Log.info("Calendar-Fetcher: Broadcasting " + events.length + " events.");
-		eventsReceivedCallback(self);
+		eventsReceivedCallback(this);
 	};
 
 	/**