Some cleaning up in the git index