Fixed merge issue with missing files; removed old tfs binding files.