Removed fixed TODO comment