Cleaning up repo, part 2