PR for 6-clean-up-repo

Fixes #6