Removed finished TODOs