diff --git a/src/main.cc b/src/main.cc
index 5eaf243c..5e4ed51f 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -11,7 +11,6 @@
 #include <torrent/http.h>
 #include <torrent/torrent.h>
 #include <torrent/exceptions.h>
-#include <torrent/poll.h>
 #include <torrent/data/chunk_utils.h>
 #include <torrent/utils/log.h>
 #include <rak/error_number.h>
@@ -132,16 +131,6 @@ client_perform() {
   control->inc_tick();
 }
 
-torrent::Poll*
-create_poll() {
-  torrent::Poll* poll = torrent::Poll::create(sysconf(_SC_OPEN_MAX));
-
-  if (poll == nullptr)
-    throw torrent::internal_error("Unable to create poll object: " + std::string(std::strerror(errno)));
-
-  return poll;
-}
-
 int
 main(int argc, char** argv) {
   try {
@@ -159,8 +148,6 @@ main(int argc, char** argv) {
     srandom(random_seed);
     srand48(random_seed);
 
-    torrent::Poll::slot_create_poll() = [](){ return create_poll(); };
-
     torrent::initialize_main_thread();
     torrent::log_initialize();
 
diff --git a/src/thread_worker.cc b/src/thread_worker.cc
index 8da3242a..2114efb4 100644
--- a/src/thread_worker.cc
+++ b/src/thread_worker.cc
@@ -7,7 +7,6 @@
 #include <cassert>
 #include <rak/path.h>
 #include <torrent/exceptions.h>
-#include <torrent/poll.h>
 
 #include "globals.h"
 #include "control.h"
@@ -22,7 +21,6 @@ ThreadWorker::~ThreadWorker() {
 
 void
 ThreadWorker::init_thread() {
-  m_poll = std::unique_ptr<torrent::Poll>(torrent::Poll::slot_create_poll()());
   m_state = STATE_INITIALIZED;
 }
 
diff --git a/test/helpers/test_main_thread.cc b/test/helpers/test_main_thread.cc
index 7163ef15..a01ed3b9 100644
--- a/test/helpers/test_main_thread.cc
+++ b/test/helpers/test_main_thread.cc
@@ -11,9 +11,6 @@
 
 std::unique_ptr<TestMainThread>
 TestMainThread::create() {
-  if (torrent::Poll::slot_create_poll() == nullptr)
-    set_create_poll();
-
   // Needs to be called before Thread is created.
   mock_redirect_defaults();
 
@@ -29,10 +26,6 @@ TestMainThread::~TestMainThread() {
 
 void
 TestMainThread::init_thread() {
-  if (!torrent::Poll::slot_create_poll())
-    throw torrent::internal_error("ThreadMain::init_thread(): Poll::slot_create_poll() not valid.");
-
-  m_poll = std::unique_ptr<torrent::Poll>(torrent::Poll::slot_create_poll()());
   m_resolver = std::make_unique<torrent::net::Resolver>();
   m_state = STATE_INITIALIZED;
 
diff --git a/test/helpers/test_thread.cc b/test/helpers/test_thread.cc
index 709310eb..45d2275a 100644
--- a/test/helpers/test_thread.cc
+++ b/test/helpers/test_thread.cc
@@ -16,25 +16,6 @@ const int test_thread::test_flag_do_work;
 const int test_thread::test_flag_pre_poke;
 const int test_thread::test_flag_post_poke;
 
-// TODO: Remove PollSelect.
-
-torrent::Poll*
-create_poll() {
-  torrent::Poll* poll = torrent::Poll::create(256);
-
-  if (poll == nullptr)
-    throw torrent::internal_error("Unable to create poll object");
-
-  return poll;
-}
-
-void
-set_create_poll() {
-  torrent::Poll::slot_create_poll() = []() {
-    return create_poll();
-  };
-}
-
 std::unique_ptr<test_thread>
 test_thread::create() {
   // Needs to be called before Thread is created.
@@ -60,8 +41,6 @@ void
 test_thread::init_thread() {
   m_state = STATE_INITIALIZED;
   m_test_state = TEST_PRE_START;
-
-  m_poll = std::unique_ptr<torrent::Poll>(create_poll());
 }
 
 void
diff --git a/test/helpers/test_thread.h b/test/helpers/test_thread.h
index 37fdbe80..abb90cf5 100644
--- a/test/helpers/test_thread.h
+++ b/test/helpers/test_thread.h
@@ -55,19 +55,4 @@ private:
   std::atomic_int m_loop_count{0};
 };
 
-void set_create_poll();
-
-// TODO: Need better cleanup here.
-// TODO: Replace these with class that holds the threads and cleans them up on destruction.
-
-#define SETUP_THREAD_DISK()                     \
-  auto thread_test = test_thread::create();     \
-  thread_test->init_thread();                   \
-  torrent::ThreadDisk::create_thread();         \
-  torrent::thread_disk()->init_thread();        \
-  torrent::thread_disk()->start_thread();
-
-#define CLEANUP_THREAD_DISK()                   \
-  torrent::ThreadDisk::destroy_thread();
-
 #endif