Cleaning up repo, part 1