diff --git a/js/Events.js b/js/Events.js
index e7e5e7e..88458b7 100644
--- a/js/Events.js
+++ b/js/Events.js
@@ -15,22 +15,6 @@ var Events = {
    */
   LOCALSTORAGE_REQUEST: "LOCALSTORAGE_REQUEST",
 
-  CANVAS_RIGHT_CLICKED: "CANVAS_RIGHT_CLICKED",
-
-  /**
-   * Event to request a refresh of the display.
-   * A bit overkill but, it's just workaround in our current drawing system.
-   * TODO: Remove or rework when redraw system is refactored.
-   */
-  REFRESH: "REFRESH",
-
-  /**
-   * Temporary event to bind the redraw of right preview film to the canvas.
-   * This redraw should be driven by model updates.
-   * TODO(vincz): Remove.
-   */
-  REDRAW_PREVIEWFILM: "REDRAW_PREVIEWFILM",
-
   /**
    * Fired each time a user setting change.
    * The payload will be:
@@ -39,7 +23,6 @@ var Events = {
    */
   USER_SETTINGS_CHANGED: "USER_SETTINGS_CHANGED",
 
-  /* Listened to by SettingsController */
   CLOSE_SETTINGS_DRAWER : "CLOSE_SETTINGS_DRAWER",
 
   /**
@@ -50,8 +33,6 @@ var Events = {
 
   FRAME_SIZE_CHANGED : "FRAME_SIZE_CHANGED",
 
-  CURRENT_FRAME_SET: "CURRENT_FRAME_SET",
-
   SELECTION_CREATED: "SELECTION_CREATED",
   SELECTION_MOVE_REQUEST: "SELECTION_MOVE_REQUEST",
   SELECTION_DISMISSED: "SELECTION_DISMISSED",
diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js
index 598b612..00e25d9 100644
--- a/js/controller/DrawingController.js
+++ b/js/controller/DrawingController.js
@@ -43,7 +43,6 @@
     this.initMouseBehavior();
 
     $.subscribe(Events.TOOL_SELECTED, $.proxy(function(evt, toolBehavior) {
-      console.log("Tool selected: ", toolBehavior);
       this.currentToolBehavior = toolBehavior;
       this.overlayFrame.clear();
     }, this));
@@ -107,7 +106,6 @@
 
     if(event.button == 2) { // right click
       this.isRightClicked = true;
-      $.publish(Events.CANVAS_RIGHT_CLICKED);
     }
 
     var coords = this.getSpriteCoordinates(event);