Mass code fix using Resharper: Removed all sorts of redundant code.
Authored by: tart 2017-01-08
Parent: [r914]
Child: [r916]