modified repo locations, removed some old unnecessary code