Remove unnecessary TODOs
Remove TODOs since they are either done or should be independent tickets