Removed a TODO comment