Cleaned unnecessary TODO's.