Removed 2 done TODOs