Deleted some TODO's