Revert "Fixed some R# complaints"

This reverts commit d13bccaeb825ed2c3709b5cf5f2db668987f9a68.
Revert "Revert "Fixed some R# complaints""

This reverts commit 0d9b2833e840048dae56d0660a2d7227732100f5.