Removed some TODOs that are no longer TODOs