diff --git a/src/eventPage.js b/src/eventPage.js
index 0df5efa..5108413 100644
--- a/src/eventPage.js
+++ b/src/eventPage.js
@@ -1,11 +1,3 @@
 chrome.browserAction.onClicked.addListener(function(activeTab) {
 	chrome.tabs.create({ url: chrome.extension.getURL('index.html'), selected: true });
-});
-
-// TODO: remove me
-// Listen for messsage from tab script
-/*chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
-	chrome.storage.local.set(request, function() {
-		console.log('saved', request);
-	});
-});*/
+});
\ No newline at end of file
diff --git a/src/script.js b/src/script.js
index ad10aa3..3305c33 100644
--- a/src/script.js
+++ b/src/script.js
@@ -61,14 +61,7 @@
 	window.saveSetting = function saveSetting(setting, value) {
 		var obj = {};
 		obj[setting] = value;
-		// TODO: remove me
-		// We delegate the saving to background script because, this tab cannot do
-		// async saving once the tab starts unloading.
-		// chrome.runtime.sendMessage(obj, function(response) {
-		// 	console.log(response);
-		// });
 		chrome.storage.local.set(obj, function() {
-			console.log('saved', request);
 		});
 	};