Removed completed TODOs 2