Updated TODO by removing added features