Removed completede TODO comment