Revert "Fixing some warnings using VS"

This reverts commit f6ccbf716c17fa799537d52c6cd530dbf94878a4.