Some fixes as we moved from svn to git
Zapped unused TODO file