Removed old TODO file
Merge branch 'master' into iridis