Repository clean-up
Merge pull request #318 from owdqa/feature/clean_up

Repository clean-up