Removing variables that are unused
Removing more unused vars / dead code
Adding ignore for xUnit warning
Fixing whitespace
Merge pull request #651 from glennblock/dev

Removing variables that are unused also adding ignore for xUnit wanrings