diff --git a/gdb-port/parser-name-instrumentation-gdb.py b/gdb-port/parser-name-instrumentation-gdb.py
index ea3dbfd827480190b9e08ecaff80ec2c2dddd2a7..9f5e63c70e38c6d4199d0249632765d5c6a1c912 100644
--- a/gdb-port/parser-name-instrumentation-gdb.py
+++ b/gdb-port/parser-name-instrumentation-gdb.py
@@ -6,17 +6,12 @@
 # {local.name : local for local in block}
 
 class Parser:
-	#TODO: remove
-	_parser_names = {}
-
 	def __init__(self, name, address):
 		self.name = name
 		self.address = address
 		self.bytes_used = {}
 	
 	def name_parser(self, name):
-		#if self.address not in Parser._parser_names:
-		#	Parser._parser_names[self.address] = name
 		self.name = name
 
 	# TODO: remove
@@ -168,7 +163,7 @@ class TopLevelParse:
 		parser_stack.push(parser_obj)
 		if self.parser_decombinator:
 			p_env = self.parser_decombinator.decompose_parser(parser_obj, self)
-			self.set_parser_env(type(p_env).__name__ + " - " + str(p_env)) # TODO: indicate parser vtable type
+			self.set_parser_env(type(p_env).__name__ + " - " + str(p_env)) # TODO: pass this as data structure to frontend
 		return parser_obj
 
 	def return_from_perform_lowlevel_parse(self):
@@ -381,7 +376,6 @@ class HammerParserBacktrace(gdb.Command):
 	def invoke(self, arg, from_tty):
 		parserstack = top_level_parse.peek_parserstack().p_stack
 		args = gdb.string_to_argv(arg)
-		# TODO: remove default 10, len(parserstack) should be default
 		if len(args) < 1:
 			maxsize = len(parserstack)
 		else: