Cleaned up some extra TODO tags