diff --git a/classes/event/course_module_instance_list_viewed.php~ b/classes/event/course_module_instance_list_viewed.php~
deleted file mode 100644
index 685c6a5..0000000
--- a/classes/event/course_module_instance_list_viewed.php~
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_game instance list viewed event.
- *
- * @package    mod_game
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_game\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_game instance list viewed event class.
- *
- * @package    mod_game
- * @since      Moodle 2.7
- * @copyright  2013 onwards Ankit Agarwal
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class course_module_instance_list_viewed extends \core\event\course_module_instance_list_viewed {
-    /**
-     * Create the event from course record.
-     *
-     * @param \stdClass $course
-     * @return course_module_instance_list_viewed
-     */
-    public static function create_from_course(\stdClass $course) {
-        $params = array(
-            'context' => \context_course::instance($course->id)
-        );
-        $event = \mod_game\event\course_module_instance_list_viewed::create($params);
-        $event->add_record_snapshot('course', $course);
-        return $event;
-    }}
-
diff --git a/classes/event/course_module_viewed.php~ b/classes/event/course_module_viewed.php~
deleted file mode 100644
index c0dda20..0000000
--- a/classes/event/course_module_viewed.php~
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_game course module viewed event.
- *
- * @package    mod_game
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_game\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_game course module viewed event class.
- *
- * @package    mod_game
- * @since      Moodle 2.6
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class course_module_viewed extends \core\event\course_module_viewed {
-    /**
-     * Create instance of event.
-     *
-     * @since Moodle 2.7
-     *
-     * @param \stdClass $game
-     * @param \context_module $context
-     * @return course_module_viewed
-     */
-    public static function viewed(\stdClass $game, \context_module $context) {
-        $data = array(
-            'context' => $context,
-            'objectid' => $game->id
-        );
-        /** @var course_module_viewed $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('game', $game);
-        return $event;
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
-        $this->data['objecttable'] = 'game';
-    }
-}
diff --git a/classes/event/game_created.php~ b/classes/event/game_created.php~
deleted file mode 100644
index 80a73b9..0000000
--- a/classes/event/game_created.php~
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_book chapter created event.
- *
- * @package    mod_book
- * @copyright  2013 Frédéric Massart
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_book\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_book chapter created event class.
- *
- * @package    mod_book
- * @since      Moodle 2.6
- * @copyright  2013 Frédéric Massart
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class chapter_created extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @since Moodle 2.7
-     *
-     * @param \stdClass $book
-     * @param \context_module $context
-     * @param \stdClass $chapter
-     * @return chapter_created
-     */
-    public static function create_from_chapter(\stdClass $book, \context_module $context, \stdClass $chapter) {
-        $data = array(
-            'context' => $context,
-            'objectid' => $chapter->id,
-        );
-        /** @var chapter_created $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('book', $book);
-        $event->add_record_snapshot('book_chapters', $chapter);
-        return $event;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' created the chapter with id '$this->objectid' for the book with the " .
-            "course module id '$this->contextinstanceid'.";
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'book', 'add chapter', 'view.php?id=' . $this->contextinstanceid . '&chapterid=' .
-            $this->objectid, $this->objectid, $this->contextinstanceid);
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventchaptercreated', 'mod_book');
-    }
-
-    /**
-     * Get URL related to the action.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/mod/book/view.php', array(
-            'id' => $this->contextinstanceid,
-            'chapterid' => $this->objectid
-        ));
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'c';
-        $this->data['edulevel'] = self::LEVEL_TEACHING;
-        $this->data['objecttable'] = 'book_chapters';
-    }
-
-}
diff --git a/classes/event/game_deleted.php~ b/classes/event/game_deleted.php~
deleted file mode 100644
index 7da9abb..0000000
--- a/classes/event/game_deleted.php~
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_game chapter deleted event.
- *
- * @package    mod_game
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_game\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_game chapter deleted event class.
- *
- * @package    mod_game
- * @since      Moodle 2.6
- * @copyright  2013 Frédéric Massart
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class chapter_deleted extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @since Moodle 2.7
-     *
-     * @param \stdClass $game
-     * @param \context_module $context
-     * @param \stdClass $chapter
-     * @return chapter_deleted
-     */
-    public static function create_from_chapter(\stdClass $game, \context_module $context, \stdClass $chapter) {
-        $data = array(
-            'context' => $context,
-            'objectid' => $chapter->id,
-        );
-        /** @var chapter_deleted $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('game', $game);
-        $event->add_record_snapshot('game_chapters', $chapter);
-        return $event;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' deleted the chapter with id '$this->objectid' for the game with the " .
-            "course module id '$this->contextinstanceid'.";
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        $chapter = $this->get_record_snapshot('game_chapters', $this->objectid);
-        return array($this->courseid, 'game', 'update', 'view.php?id='.$this->contextinstanceid, $chapter->gameid, $this->contextinstanceid);
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventchapterdeleted', 'mod_game');
-    }
-
-    /**
-     * Get URL related to the action.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/mod/game/view.php', array('id' => $this->contextinstanceid));
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'd';
-        $this->data['edulevel'] = self::LEVEL_TEACHING;
-        $this->data['objecttable'] = 'game_chapters';
-    }
-}
diff --git a/classes/event/game_played.php~ b/classes/event/game_played.php~
deleted file mode 100644
index 0e64db7..0000000
--- a/classes/event/game_played.php~
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_game chapter viewed event.
- *
- * @package    mod_game
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_game\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_game chapter viewed event class.
- *
- * @package    mod_game
- * @since      Moodle 2.6
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class game_played extends \core\event\base {
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' viewed the game with id '$this->objectid' for the game with the " .
-            "course module id '$this->contextinstanceid'.";
-    }
-
-    public static function played(\stdClass $game, \context_module $context) {
-        $data = array(
-            'context' => $context,
-            'objectid' => $game->id
-        );
-        /** @var chapter_viewed $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('game', $game);
-        return $event;
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'game', 'view', 'view.php?id=' . $this->contextinstanceid, $this->objectid, $this->contextinstanceid);
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventgameviewed', 'mod_game');
-    }
-
-    /**
-     * Get URL related to the action.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/mod/game/view.php', array('id' => $this->contextinstanceid));
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
-        $this->data['objecttable'] = 'game';
-    }
-}
diff --git a/classes/event/game_updated.php~ b/classes/event/game_updated.php~
deleted file mode 100644
index b8f2c73..0000000
--- a/classes/event/game_updated.php~
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_book chapter updated event.
- *
- * @package    mod_book
- * @copyright  2013 Frédéric Massart
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_book\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_book chapter updated event class.
- *
- * @package    mod_book
- * @since      Moodle 2.6
- * @copyright  2013 Frédéric Massart
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class chapter_updated extends \core\event\base {
-    /**
-     * Create instance of event.
-     *
-     * @since Moodle 2.7
-     *
-     * @param \stdClass $book
-     * @param \context_module $context
-     * @param \stdClass $chapter
-     * @return chapter_updated
-     */
-    public static function create_from_chapter(\stdClass $book, \context_module $context, \stdClass $chapter) {
-        $data = array(
-            'context' => $context,
-            'objectid' => $chapter->id,
-        );
-        /** @var chapter_updated $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('book', $book);
-        $event->add_record_snapshot('book_chapters', $chapter);
-        return $event;
-    }
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' updated the chapter with id '$this->objectid' for the book with the " .
-            "course module id '$this->contextinstanceid'.";
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'book', 'update chapter', 'view.php?id=' . $this->contextinstanceid . '&chapterid=' .
-            $this->objectid, $this->objectid, $this->contextinstanceid);
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventchapterupdated', 'mod_book');
-    }
-
-    /**
-     * Get URL related to the action.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/mod/book/view.php', array(
-            'id' => $this->contextinstanceid,
-            'chapterid' => $this->objectid
-        ));
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'u';
-        $this->data['edulevel'] = self::LEVEL_TEACHING;
-        $this->data['objecttable'] = 'book_chapters';
-    }
-
-}
diff --git a/classes/event/game_viewed.php~ b/classes/event/game_viewed.php~
deleted file mode 100644
index d25ffd5..0000000
--- a/classes/event/game_viewed.php~
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * The mod_game chapter viewed event.
- *
- * @package    mod_game
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace mod_game\event;
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * The mod_game chapter viewed event class.
- *
- * @package    mod_game
- * @since      Moodle 2.6
- * @copyright  2014 Vasilis Daloukas
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class chapter_viewed extends \core\event\base {
-
-    /**
-     * Returns description of what happened.
-     *
-     * @return string
-     */
-    public function get_description() {
-        return "The user with id '$this->userid' viewed the game with id '$this->objectid' for the game with the " .
-            "course module id '$this->contextinstanceid'.";
-    }
-
-    public static function create(\stdClass $game, \context_module $context) {
-        $data = array(
-            'context' => $context
-        );
-        /** @var chapter_viewed $event */
-        $event = self::create($data);
-        $event->add_record_snapshot('game', $game);
-        return $event;
-    }
-
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'game', 'view', 'view.php?id=' . $this->contextinstanceid, $this->objectid, $this->contextinstanceid);
-    }
-
-    /**
-     * Return localised event name.
-     *
-     * @return string
-     */
-    public static function get_name() {
-        return get_string('eventgameviewed', 'mod_game');
-    }
-
-    /**
-     * Get URL related to the action.
-     *
-     * @return \moodle_url
-     */
-    public function get_url() {
-        return new \moodle_url('/mod/game/view.php', array('id' => $this->contextinstanceid));
-    }
-
-    /**
-     * Init method.
-     *
-     * @return void
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_PARTICIPATING;
-        $this->data['objecttable'] = 'game';
-    }
-}
diff --git a/locallib.php b/locallib.php
index 788653b..3ca3f03 100755
--- a/locallib.php
+++ b/locallib.php
@@ -2096,5 +2096,5 @@ function game_use_events()
 {
     $version = game_get_moodle_version();
     
-    return( $version >= '02.06');
+    return( $version >= '02.07');
 }
diff --git a/version.php b/version.php
index 14bc95e..ca1a9ad 100755
--- a/version.php
+++ b/version.php
@@ -11,7 +11,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $module->component = 'mod_game';  // Full name of the plugin (used for diagnostics)
-$module->version   = 2014061801;  // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2014061802;  // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2010112400;  // Requires Moodle 2.0
 $module->cron      = 0;           // Period for cron to check this module (secs)
-$module->release   = '3.18.18';
+$module->release   = '3.18.18.2';