Better cleanup of GitOid