Removed unneeded TODO