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

More cleanup