Removing extra TODOs

Removing TODOs that were done in the previous commit.