diff --git a/src/main/connection.c b/src/main/connection.c
index 88f5447..1f33c15 100644
--- a/src/main/connection.c
+++ b/src/main/connection.c
@@ -277,7 +277,7 @@ static void connection_update_io_timeout(liConnection *con) {
 static gboolean connection_try_read(liConnection *con) {
 	liNetworkStatus res;
 
-// 	con->can_read = TRUE;
+	/* con->can_read = TRUE; */
 
 	if (!con->in->is_closed) {
 		goffset transferred;
diff --git a/src/main/http_headers_lua.c b/src/main/http_headers_lua.c
index 985b418..fe6658f 100644
--- a/src/main/http_headers_lua.c
+++ b/src/main/http_headers_lua.c
@@ -183,7 +183,6 @@ static int lua_http_headers_pairs(lua_State *L) {
 	lua_pushcclosure(L, lua_http_headers_next, 3);
 
 	return 1;
-// 	return li_lua_ghashtable_gstring_pairs(L, env->table);
 }
 
 static const luaL_Reg http_headers_mt[] = {
diff --git a/src/main/log.c b/src/main/log.c
index 13d808c..3f4f18a 100644
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -63,7 +63,7 @@ static liLog *log_open(liServer *srv, GString *path) {
 					int err = errno;
 					GString *str = g_string_sized_new(255);
 					g_string_append_printf(str, "(error) %s.%d: failed to open log file '%s': %s", LI_REMOVE_PATH(__FILE__), __LINE__, path->str, g_strerror(err));
-					//li_log_write_stderr(srv, str->str, TRUE);
+					/* li_log_write_stderr(srv, str->str, TRUE); */
 					g_string_free(str, TRUE);
 					return NULL;
 				}
@@ -269,7 +269,6 @@ gboolean li_log_write(liServer *srv, liVRequest *vr, liLogLevel log_level, guint
 		ev_async_send(srv->logs.loop, &srv->logs.watcher);
 	}
 
-//g_print("log_write: %s -> %s\n", log_line->str, path->str);
 	return TRUE;
 }
 
@@ -350,7 +349,7 @@ static void log_watcher_cb(struct ev_loop *loop, ev_async *w, int revents) {
 		/* todo: support for other logtargets than files */
 		while (bytes_written < (gssize)msg->len) {
 			write_res = write(log->fd, msg->str + bytes_written, msg->len - bytes_written);
-			//write_res = msg->len;
+			/* write_res = msg->len; */
 
 			/* write() failed, check why */
 			if (write_res == -1) {
diff --git a/src/modules/mod_limit.c b/src/modules/mod_limit.c
index 82ab2f1..724473a 100644
--- a/src/modules/mod_limit.c
+++ b/src/modules/mod_limit.c
@@ -201,8 +201,6 @@ static void mod_limit_vrclose(liVRequest *vr, liPlugin *p) {
 		}
 	}
 
-	//g_ptr_array_index(vr->plugin_ctx, p->id) = NULL;
-	//g_ptr_array_set_size(arr, 0);
 	g_ptr_array_free(arr, TRUE);
 }
 
diff --git a/src/modules/mod_userdir.c b/src/modules/mod_userdir.c
index cd9a981..b64274b 100644
--- a/src/modules/mod_userdir.c
+++ b/src/modules/mod_userdir.c
@@ -110,7 +110,7 @@ static liHandlerResult userdir(liVRequest *vr, gpointer param, gpointer *context
 			return LI_HANDLER_GO_ON;
 		}
 
-		// user found
+		/* user found */
 		g_string_append(vr->physical.doc_root, pwd.pw_dir);
 		g_string_append_c(vr->physical.doc_root, G_DIR_SEPARATOR);
 		has_username = TRUE;
@@ -203,12 +203,12 @@ static liAction* userdir_create(liServer *srv, liWorker *wrk, liPlugin* p, liVal
 
 	parts = g_array_new(FALSE, FALSE, sizeof(userdir_part));
 
-	// parse pattern
+	/* parse pattern */
 	for (c_last = c = str->str; c != str->str + str->len; c++) {
 		if (*c == '*') {
-			// username
+			/* username */
 			if (c - c_last > 0) {
-				// push last string
+				/* push last string */
 				part.type = USERDIR_PART_STRING;
 				part.data.str = g_string_new_len(c_last, c - c_last);
 				g_array_append_val(parts, part);
@@ -218,9 +218,9 @@ static liAction* userdir_create(liServer *srv, liWorker *wrk, liPlugin* p, liVal
 			part.type = USERDIR_PART_USERNAME;
 			g_array_append_val(parts, part);
 		} else if (*c == '$' && *(c+1) >= '1' && *(c+2) <= '9') {
-			// letter
+			/* letter */
 			if (c - c_last > 0) {
-				// push last string
+				/* push last string */
 				part.type = USERDIR_PART_STRING;
 				part.data.str = g_string_new_len(c_last, c - c_last);
 				g_array_append_val(parts, part);
@@ -234,7 +234,7 @@ static liAction* userdir_create(liServer *srv, liWorker *wrk, liPlugin* p, liVal
 	}
 
 	if (c - c_last > 0) {
-		// push last string
+		/* push last string */
 		part.type = USERDIR_PART_STRING;
 		part.data.str = g_string_new_len(c_last, c - c_last);
 		g_array_append_val(parts, part);