diff --git a/ugly_hacks/santiago/protocols/https/templates/consumedLocation-get.tmpl b/ugly_hacks/santiago/protocols/https/templates/consumedLocation-get.tmpl
deleted file mode 100644
index 3cc0b5df6..000000000
--- a/ugly_hacks/santiago/protocols/https/templates/consumedLocation-get.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-  <body>
-    <p>You are <a href="/consuming">consuming</a> 
-      <a href="/consuming/$service">$service</a> from
-      <a href="/consuming/$service/$host">$host</a> at:</p>
-    #if $locations
-    <ul>
-      #for $location in $locations
-      <li><a href="$location">$location</a></li>
-      #end for
-    </ul>
-    #end if
-  </body>
-</html>
diff --git a/ugly_hacks/santiago/protocols/https/templates/consumedService-get.tmpl b/ugly_hacks/santiago/protocols/https/templates/consumedService-get.tmpl
index 64d975f5a..001ab95a3 100644
--- a/ugly_hacks/santiago/protocols/https/templates/consumedService-get.tmpl
+++ b/ugly_hacks/santiago/protocols/https/templates/consumedService-get.tmpl
@@ -1,10 +1,11 @@
 <html>
   <body>
-    <p>You are <a href="/consuming">consuming</a> $service from:</p>
-    #if $hosts
+    <p>You are <a href="/consuming">consuming</a> $service from
+      <a href="/consuming/$host">$host</a> at:</p>
+    #if $locations
     <ul>
-      #for $host in $hosts
-      <li><a href="/consuming/$service/$host">$host</a></li>
+      #for $location in $locations
+      <li><a href="$location">$location</a></li>
       #end for
     </ul>
     #end if
diff --git a/ugly_hacks/santiago/protocols/https/templates/consuming-get.tmpl b/ugly_hacks/santiago/protocols/https/templates/consuming-get.tmpl
index 625ade4c5..df4edc3e7 100644
--- a/ugly_hacks/santiago/protocols/https/templates/consuming-get.tmpl
+++ b/ugly_hacks/santiago/protocols/https/templates/consuming-get.tmpl
@@ -1,10 +1,10 @@
 <html>
   <body>
-    #if $services
-    <p>You are consuming these services:</p>
+    #if $hosts
+    <p>You are consuming services from these hosts:</p>
     <ul>
-      #for $service in $services
-      <li><a href="/consuming/$service">$service</a></li>
+      #for $host in $hosts
+      <li><a href="/consuming/$host">$host</a></li>
       #end for
     </ul>
     #end if
diff --git a/ugly_hacks/santiago/protocols/https/templates/hostedService-get.tmpl b/ugly_hacks/santiago/protocols/https/templates/hostedService-get.tmpl
index 6773eb5d3..e28fbb2df 100644
--- a/ugly_hacks/santiago/protocols/https/templates/hostedService-get.tmpl
+++ b/ugly_hacks/santiago/protocols/https/templates/hostedService-get.tmpl
@@ -1,6 +1,5 @@
 <html>
   <body>
-    <p>$message</p>
     <p>You're <a href="/hosting">hosting</a>
       $service for <a href="/hosting/$client/">$client</a> at:</p>
     #if $locations
