MSVC project cleanup

This is going away soon but I'm trying to clean up the loose ends.