Remove unnecessary TODO's
Eliminate a few blue flags