More cleanup
Merge pull request #543 from owdqa/feature/cleanup

More cleanup