Removed deprecated "TODO".