diff --git a/README.md b/README.md
index 1a546d10..a4d4fdaf 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ manner, polling will check if the upstream repository contains any new
 changes, and use that as the triggering condition of the new build.
  This plugin is currently intended to support Mercurial 1.0 and later.
 
-Viewers included are `bitbucket`, `fisheye`, `google-code`, `hgweb`,
-`kiln`, and `rhodecode`.
+Viewers are included for various hosted services.
 
 ### Push Notifications
 
diff --git a/src/main/java/hudson/plugins/mercurial/browser/BitBucket.java b/src/main/java/hudson/plugins/mercurial/browser/BitBucket.java
deleted file mode 100644
index 65eb7318..00000000
--- a/src/main/java/hudson/plugins/mercurial/browser/BitBucket.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package hudson.plugins.mercurial.browser;
-
-import hudson.Extension;
-import hudson.plugins.mercurial.MercurialChangeSet;
-import hudson.util.FormValidation;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-
-import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.QueryParameter;
-
-/**
- * Mercurial web interface served using a <a href="http://bitbucket.org/">BitBucket</a> repository.
- */
-public class BitBucket extends HgBrowser {
-    
-    @DataBoundConstructor
-    public BitBucket(String url) throws MalformedURLException {
-        super(url);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public URL getChangeSetLink(MercurialChangeSet changeSet)
-            throws IOException {
-        current = changeSet;
-        return new URL(getUrl(), "changeset/" + changeSet.getShortNode() + "/");
-    }
-
-    /**
-     * {@inheritDoc} 
-     * 
-     * Throws {@link IllegalStateException} when this method is called before at least one call 
-     * to {@literal getChangeSetLink(MercurialChangeSet)}.
-     */
-    @Override
-    public URL getFileLink(String path) throws MalformedURLException {
-        checkCurrentIsNotNull();
-        // http://bitbucket.org/mfriedenhagen/hudson-mercurial/src/d736d15e5389/src/main/java/hudson/plugins/mercurial/browser/HgBrowser.java        
-        return new URL(getUrl(), "src/" + current.getShortNode() + "/" + path);
-    }
-    
-    /**
-     * {@inheritDoc}
-     * 
-     * Throws {@link IllegalStateException} when this method is called before at least one call 
-     * to {@literal getChangeSetLink(MercurialChangeSet)}.
-     */
-    @Override
-    public URL getDiffLink(String path) throws MalformedURLException {
-        checkCurrentIsNotNull();
-        // http://bitbucket.org/mfriedenhagen/hudson-mercurial/changeset/d736d15e5389/#chg-src/main/java/hudson/plugins/mercurial/browser/HgBrowser.java
-        return new URL(getUrl(), "changeset/" + current.getShortNode() + "/#chg-" + path);
-    }
-    
-    @Extension
-    public static class DescriptorImpl extends HgBrowserDescriptor {
-        public String getDisplayName() {
-            return "bitbucket";
-        }
-
-        @Override public FormValidation doCheckUrl(@QueryParameter String url) {
-            return _doCheckUrl(url);
-        }
-
-        @Override protected FormValidation check(URL url) {
-            if (url.toString().matches("https?://bitbucket[.]org/[^/]+/[^/]+/")) {
-                return FormValidation.ok();
-            } else {
-                return FormValidation.warning("Possibly incorrect root URL; expected http://bitbucket.org/USERNAME/REPOS/");
-            }
-        }
-    }
-
-    private static final long serialVersionUID = 1L;
-}
diff --git a/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/config.jelly b/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/config.jelly
deleted file mode 100644
index 140cf940..00000000
--- a/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/config.jelly
+++ /dev/null
@@ -1,6 +0,0 @@
-<?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:entry field="url" title="URL">
-    <f:textbox/>
-  </f:entry>
-</j:jelly>
diff --git a/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/help-url.html b/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/help-url.html
deleted file mode 100644
index 017c7f3e..00000000
--- a/src/main/resources/hudson/plugins/mercurial/browser/BitBucket/help-url.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-  Specify the root URL serving this repository (such as <a href="http://bitbucket.org/USERNAME/REPOS/">this</a>).
-</div>
\ No newline at end of file
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
index 73827207..ad171878 100644
--- a/src/main/resources/index.jelly
+++ b/src/main/resources/index.jelly
@@ -2,7 +2,7 @@
 <div>
   This plugin integrates <a href="http://www.selenic.com/mercurial/">Mercurial SCM</a> with Jenkins.
   It includes repository browsing support for <code>hg serve</code>/<code>hgweb</code>,
-  Google Code, Bitbucket, FishEye, KilnHG and RhodeCode. Features include guaranteed clean builds, named branch
+  as well as hosted services like Google Code. Features include guaranteed clean builds, named branch
   support, module lists, Mercurial tool installation, and
   automatic caching.
 </div>
diff --git a/src/test/java/hudson/plugins/mercurial/browser/BitBucketTest.java b/src/test/java/hudson/plugins/mercurial/browser/BitBucketTest.java
deleted file mode 100644
index e7671a88..00000000
--- a/src/test/java/hudson/plugins/mercurial/browser/BitBucketTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * BitBucketTest.java 07.09.2009
- */
-package hudson.plugins.mercurial.browser;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-public class BitBucketTest extends AbstractBrowserTestBase {
-
-    private static final String REPO_URL = "http://www.example.org/hg/repos";
-
-    public BitBucketTest() throws MalformedURLException {
-        super(new BitBucket(REPO_URL));        
-    }
-
-    @Test
-    public void testGetChangeSetLinkMercurialChangeSet() throws IOException {
-        testGetChangeSetLinkMercurialChangeSet(REPO_URL+ "/changeset/6704efde8754/");
-    }
-    
-    @Test
-    public void testGetFileLink() throws IOException {
-        testGetFileLink(REPO_URL + "/src/6704efde8754/src/main/java/hudson/plugins/mercurial/browser/HgBrowser.java");
-    }
-
-    @Test
-    public void testGetDiffLink() throws IOException {        
-        testGetDiffLink(REPO_URL + "/changeset/6704efde8754/#chg-src/main/java/hudson/plugins/mercurial/browser/HgBrowser.java");
-    }
-}
diff --git a/src/test/java/hudson/plugins/mercurial/browser/HgBrowserSelectionTest.java b/src/test/java/hudson/plugins/mercurial/browser/HgBrowserSelectionTest.java
index 967bf830..85b97bc8 100644
--- a/src/test/java/hudson/plugins/mercurial/browser/HgBrowserSelectionTest.java
+++ b/src/test/java/hudson/plugins/mercurial/browser/HgBrowserSelectionTest.java
@@ -36,9 +36,9 @@ public class HgBrowserSelectionTest {
         FreeStyleProject p = (FreeStyleProject) j.jenkins.getItem("foo");
         MercurialSCM ms = (MercurialSCM) p.getScm();
         final HgBrowser browser = ms.getBrowser();
-        assertEquals("wrong url", "http://bitbucket.org/", browser.getUrl().toString());
-        assertTrue("class:" + browser.getClass(), browser instanceof BitBucket);
-        j.assertEqualBeans(new BitBucket("http://bitbucket.org/"), browser, "url");
+        assertEquals("wrong url", "http://code.google.com/p/xxx/source/", browser.getUrl().toString());
+        assertTrue("class:" + browser.getClass(), browser instanceof GoogleCode);
+        j.assertEqualBeans(new GoogleCode("http://code.google.com/p/xxx/source/"), browser, "url");
     }
 
     @Issue("JENKINS-4514")
@@ -47,11 +47,11 @@ public class HgBrowserSelectionTest {
         FreeStyleProject p = (FreeStyleProject) j.jenkins.getItem("foo");
         MercurialSCM ms = (MercurialSCM) p.getScm();
         final HgBrowser browser = ms.getBrowser();
-        assertEquals("wrong url", "http://bitbucket.org/", browser.getUrl().toString());
-        assertTrue("class:" + browser.getClass(), browser instanceof BitBucket);
-        j.assertEqualBeans(new BitBucket("http://bitbucket.org/"), browser, "url");
+        assertEquals("wrong url", "http://code.google.com/p/xxx/source/", browser.getUrl().toString());
+        assertTrue("class:" + browser.getClass(), browser instanceof GoogleCode);
+        j.assertEqualBeans(new GoogleCode("http://code.google.com/p/xxx/source/"), browser, "url");
         final List<Descriptor<RepositoryBrowser<?>>> browserDescriptors = ms.getDescriptor().getBrowserDescriptors();
-        assertTrue("Could not find BitBucket in " + browserDescriptors, browserDescriptors.contains(browser.getDescriptor()));
+        assertTrue("Could not find GoogleCode in " + browserDescriptors, browserDescriptors.contains(browser.getDescriptor()));
     }
 
     @Issue("JENKINS-20186")
diff --git a/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/browsersAvailableInDropDown.zip b/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/browsersAvailableInDropDown.zip
index 5efb129d..cefe2439 100644
Binary files a/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/browsersAvailableInDropDown.zip and b/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/browsersAvailableInDropDown.zip differ
diff --git a/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/pickingUpAlternativeBrowser.zip b/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/pickingUpAlternativeBrowser.zip
index 0636acb9..898473cb 100644
Binary files a/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/pickingUpAlternativeBrowser.zip and b/src/test/resources/hudson/plugins/mercurial/browser/HgBrowserSelectionTest/pickingUpAlternativeBrowser.zip differ