Removed unnecessary TODO's