Repo cleanup. Fixes #6