Cleanup deps, add repos