Git cleanup

Cleanups and one fix so that we swith to the desired version even if it was previously downloaded from the upstream repo.