Usings cleanup
MSVC project cleanup