More cleaning up
Merge pull request #530 from owdqa/feature/cleanup

More cleaning up