Remove unused file
Update code around an existing TODO
Updated VS version
Add root import support for generic parameters. Pass a tough test.