diff --git a/README.md b/README.md
index e743ab5a..2c0fd332 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ The bitcoinj library is a Java implementation of the Bitcoin protocol, which all
 
 * Java 6 for the core modules, Java 8 for everything else
 * [Maven 3+](http://maven.apache.org) - for building the project
-* [Orchid](https://github.com/subgraph/Orchid) - for secure communications over [TOR](https://www.torproject.org)
 * [Google Protocol Buffers](https://github.com/google/protobuf) - for use with serialization and hardware communications
 
 ### Getting started
diff --git a/core/src/main/java/org/bitcoinj/core/Context.java b/core/src/main/java/org/bitcoinj/core/Context.java
index 44d8c758..af3819ef 100644
--- a/core/src/main/java/org/bitcoinj/core/Context.java
+++ b/core/src/main/java/org/bitcoinj/core/Context.java
@@ -28,7 +28,6 @@ import static com.google.common.base.Preconditions.*;
 // TODO: Move Threading.USER_THREAD to here and leave behind just a source code stub. Allow different instantiations of the library to use different user threads.
 // TODO: Keep a URI to where library internal data files can be found, to abstract over the lack of JAR files on Android.
 // TODO: Stash anything else that resembles global library configuration in here and use it to clean up the rest of the API without breaking people.
-// TODO: Move the TorClient into Context, so different parts of the library can read data over Tor without having to request it directly. (or maybe a general socket factory??)
 
 /**
  * <p>The Context object holds various objects and pieces of configuration that are scoped to a specific instantiation of
diff --git a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
index 9e3507df..37043ba4 100644
--- a/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
+++ b/core/src/main/java/org/bitcoinj/net/discovery/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Classes that know how to discover peers in the P2P network using DNS, IRC or DNS via Tor (orchid).
+ * Classes that know how to discover peers in the P2P network using DNS or HTTP.
  */
 package org.bitcoinj.net.discovery;
\ No newline at end of file