Removing TODO comment, more appropriate in issue tracking