Bill doing some cleanup.
Merge pull request #408 from badgerProd/master

Cleanup