Removed done TODOs