Removed solved TODOs