Continue migration to git. Some clean ups