Remove some services that don't exist or we're prohibited from using
Update references to point to the new repo location