Revert "Various new commits"

This reverts commit d52a6ab6549f645e384f2c05df985eff0b685f5d.
Fix csproj's