Removed unneeded items from the TODO list