Logical tidyup of git repo