diff --git a/default.xml b/default.xml
index 31305ac..b88b384 100644
--- a/default.xml
+++ b/default.xml
@@ -4,9 +4,6 @@
     fetch="https://gfiber-internal.googlesource.com/"
     name="gfiber-internal"
     review="https://gfiber-internal-review.googlesource.com/"/>
-  <remote
-    fetch="https://code.google.com/"
-    name="cgc"/>
   <default remote="gfiber-internal" revision="master" sync-j="12"/>
 
   <project name="manifests" path="manifest"/>
@@ -23,6 +20,7 @@
   <project name="vendor/broadcom/rockford"/>
   <project name="vendor/humax/bootloader"/>
   <project name="vendor/humax/misc"/>
+  <project name="vendor/google/catawampus"/>
   <project name="vendor/google/channel_srv"/>
   <project name="vendor/google/dvbcapture"/>
   <project name="vendor/google/freetypejni"/>
@@ -48,6 +46,4 @@
   <project name="vendor/sagetv/miniclient"/>
   <project name="vendor/sagetv/pullreader"/>
   <project name="vendor/skelmir/vm"/>
-  <project name="a/google.com/p/athena-cwmp/" path="vendor/google/catawampus" remote="cgc"/>
-
 </manifest>