Remove things that look done.
Remove unused variable
Merge pull request #1199 from carsonmcdonald/misccleanup

Minor cleanup