Revert "Resharper Code Cleanup"

This reverts commit 37ffbe6d22ff8c15222c4aa99c034885a07b8bf9.