Removal of minor TODOs

Some were completed before and we forgot to remove the TODO, while
others I just took care of.