Some cleanup work + resharper redundancy fixes.