diff --git a/systemd/system/multi-user.target.wants/packet-phone-home.service b/systemd/system/multi-user.target.wants/packet-phone-home.service
deleted file mode 120000
index e59cf56..0000000
--- a/systemd/system/multi-user.target.wants/packet-phone-home.service
+++ /dev/null
@@ -1 +0,0 @@
-../packet-phone-home.service
\ No newline at end of file
diff --git a/systemd/system/oem-cloudinit.service b/systemd/system/oem-cloudinit.service
index 69eeb9b..86d5ef7 100644
--- a/systemd/system/oem-cloudinit.service
+++ b/systemd/system/oem-cloudinit.service
@@ -4,7 +4,7 @@ Description=Run cloudinit
 [Service]
 EnvironmentFile=/var/run/ignition.env
 Type=oneshot
-ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp rackspace-onmetal azure cloudsigma packet vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"'
+ExecCondition=/usr/bin/bash -xc 'OEMS=(aws gcp azure cloudsigma vmware digitalocean openstack); echo $${OEMS[*]} | tr " " "\n" | grep -q -x -F "${OEM_ID}"'
 ExecStart=/usr/bin/bash -xc '/usr/bin/coreos-cloudinit --oem="$(if [ "${OEM_ID}" = aws -o "${OEM_ID}" = openstack ]; then echo ec2-compat; elif [ "${OEM_ID}" = gcp ]; then echo gce; else echo "${OEM_ID}" ; fi)"'
 
 [Install]
diff --git a/systemd/system/packet-phone-home.service b/systemd/system/packet-phone-home.service
deleted file mode 100644
index 570531c..0000000
--- a/systemd/system/packet-phone-home.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-ConditionKernelCommandLine=|ignition.platform.id=packet
-ConditionKernelCommandLine=|flatcar.oem.id=packet
-ConditionKernelCommandLine=|coreos.oem.id=packet
-
-Description=Report Success to Packet
-ConditionFirstBoot=true
-Wants=coreos-metadata.service
-After=coreos-metadata.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-EnvironmentFile=/run/metadata/flatcar
-ExecStart=/usr/bin/curl -fsSL --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}"
-Restart=on-failure
-RestartSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/system/sshkeys.service b/systemd/system/sshkeys.service
index eb16382..0e0831b 100644
--- a/systemd/system/sshkeys.service
+++ b/systemd/system/sshkeys.service
@@ -4,10 +4,6 @@ After=update-ssh-keys-after-ignition.service
 
 ConditionPathIsSymbolicLink=!/etc/systemd/system/coreos-metadata-sshkeys@core.service
 
-ConditionKernelCommandLine=|ignition.platform.id=packet
-ConditionKernelCommandLine=|flatcar.oem.id=packet
-ConditionKernelCommandLine=|coreos.oem.id=packet
-
 ConditionKernelCommandLine=|ignition.platform.id=ec2
 ConditionKernelCommandLine=|flatcar.oem.id=ec2
 ConditionKernelCommandLine=|coreos.oem.id=ec2
diff --git a/tests/coreos-install/positive/general.go b/tests/coreos-install/positive/general.go
index 6e0911f..69154ac 100644
--- a/tests/coreos-install/positive/general.go
+++ b/tests/coreos-install/positive/general.go
@@ -79,16 +79,6 @@ hostname: "coreos1"`),
 		Func: baseTest,
 		OEM:  util.StringToPtr("digitalocean"),
 	})
-	register.Register(register.Test{
-		Name: "OEM - packet",
-		Func: baseTest,
-		OEM:  util.StringToPtr("packet"),
-	})
-	register.Register(register.Test{
-		Name: "OEM - rackspace",
-		Func: baseTest,
-		OEM:  util.StringToPtr("rackspace"),
-	})
 	register.Register(register.Test{
 		Name: "OEM - vmware_raw",
 		Func: baseTest,
diff --git a/udev/rules.d/90-cloud-storage.rules b/udev/rules.d/90-cloud-storage.rules
index 920a5a1..a5c8105 100644
--- a/udev/rules.d/90-cloud-storage.rules
+++ b/udev/rules.d/90-cloud-storage.rules
@@ -3,12 +3,6 @@
 ACTION=="remove", GOTO="cloud_storage_end"
 SUBSYSTEM!="block", GOTO="cloud_storage_end"
 
-# Google GCE by-id
-KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
-KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="PersistentDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"
-KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"
-KERNEL=="sd*|vd*", ENV{ID_VENDOR}=="Google", ENV{ID_MODEL}=="EphemeralDisk", ENV{ID_SERIAL_SHORT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}-part%n"
-
 ## AWS EBS NVMe names
 ## https://github.com/coreos/bugs/issues/2399
 # NVMe devices
@@ -19,6 +13,7 @@ KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Am
 KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", SYMLINK+="disk/by-id/nvme-$attr{model}_$attr{serial}-ns-$env{_NS_ID}-part%n", OPTIONS+="string_escape=replace"
 KERNEL=="nvme[0-9]*n[0-9]*p[0-9]*", ENV{DEVTYPE}=="partition", ATTRS{model}=="Amazon Elastic Block Store", ATTRS{serial}=="?*", ENV{_NS_ID}=="?*", PROGRAM="cloud_aws_ebs_nvme_id -d /dev/%k", SYMLINK+="%c%n"
 
+# GCE is handled in the app-admin/google-guest-configs package.
 # TODO: Anyone else support friendly names?
 
 LABEL="cloud_storage_end"