Cleanup Some Repos/Track Some Upstream