diff --git a/aes.cpp b/aes.cpp
index c8006cb..4f1070d 100644
--- a/aes.cpp
+++ b/aes.cpp
@@ -1,7 +1,6 @@
 #include "aes.hpp"
 
 #include <cstring>
-#include <iostream>
 
 #include "profiler.hpp"
 
@@ -138,7 +137,7 @@ uint32_t AES::roundkey_g(uint32_t last_roundkey, uint8_t round)
 	uint8_t *last = (uint8_t*) &last_roundkey;
 	uint8_t *next = (uint8_t*) &result;
 	next[3] = sbox[last[0]];
-	next[0] = sbox[last[1]] ^ rc[round]; // TODO Check round
+	next[0] = sbox[last[1]] ^ rc[round];
 	next[1] = sbox[last[2]];
 	next[2] = sbox[last[3]];
 	return result;
diff --git a/main.cpp b/main.cpp
index 8e68875..37818ff 100644
--- a/main.cpp
+++ b/main.cpp
@@ -27,7 +27,6 @@ string prompt(char separator = '>')
 void print_help()
 {
 	PROFILER_RECORD;
-	// TODO Verify whether there are more/less commands
 	cout << "The following commands are available: help, login, register, exit" << endl;
 }
 
@@ -76,7 +75,6 @@ void login()
 	print_flag();
 }
 
-#include <iomanip>
 void register_user()
 {
 	PROFILER_RECORD;