Remove commented TODO