Cleaning up, suppressing warnings that we can't do anything about due to vanilla code.
Merge pull request #277 from bolte-17/Cleanup

Cleaning up, suppressing warnings that we can't do anything about due to vanilla code.