removing TODO comment