diff --git a/src/od_server.h b/src/od_server.h
index 8bc5301a..b90f2137 100644
--- a/src/od_server.h
+++ b/src/od_server.h
@@ -13,11 +13,8 @@ typedef enum
 {
 	OD_SUNDEF,
 	OD_SIDLE,
-	OD_SEXPIRE,
-	OD_SCLOSE,
-	OD_SCONNECT,
-	OD_SRESET,
-	OD_SACTIVE
+	OD_SACTIVE,
+	OD_SEXPIRE
 } od_serverstate_t;
 
 struct od_server
diff --git a/src/od_server_pool.c b/src/od_server_pool.c
index 97487669..4a0a3bcb 100644
--- a/src/od_server_pool.c
+++ b/src/od_server_pool.c
@@ -29,18 +29,12 @@
 
 void od_serverpool_init(od_serverpool_t *pool)
 {
-	pool->count_active = 0;
-	pool->count_connect = 0;
-	pool->count_reset = 0;
-	pool->count_expire = 0;
-	pool->count_close = 0;
 	pool->count_idle = 0;
-	od_list_init(&pool->active);
-	od_list_init(&pool->connect);
-	od_list_init(&pool->reset);
+	pool->count_active = 0;
+	pool->count_expire = 0;
 	od_list_init(&pool->idle);
+	od_list_init(&pool->active);
 	od_list_init(&pool->expire);
-	od_list_init(&pool->close);
 	od_list_init(&pool->link);
 }
 
@@ -56,18 +50,6 @@ void od_serverpool_free(od_serverpool_t *pool)
 		server = od_container_of(i, od_server_t, link);
 		od_server_free(server);
 	}
-	od_list_foreach_safe(&pool->close, i, n) {
-		server = od_container_of(i, od_server_t, link);
-		od_server_free(server);
-	}
-	od_list_foreach_safe(&pool->connect, i, n) {
-		server = od_container_of(i, od_server_t, link);
-		od_server_free(server);
-	}
-	od_list_foreach_safe(&pool->reset, i, n) {
-		server = od_container_of(i, od_server_t, link);
-		od_server_free(server);
-	}
 	od_list_foreach_safe(&pool->active, i, n) {
 		server = od_container_of(i, od_server_t, link);
 		od_server_free(server);
@@ -85,18 +67,9 @@ void od_serverpool_set(od_serverpool_t *pool, od_server_t *server,
 	case OD_SEXPIRE:
 		pool->count_expire--;
 		break;
-	case OD_SCLOSE:
-		pool->count_close--;
-		break;
 	case OD_SIDLE:
 		pool->count_idle--;
 		break;
-	case OD_SCONNECT:
-		pool->count_connect--;
-		break;
-	case OD_SRESET:
-		pool->count_reset--;
-		break;
 	case OD_SACTIVE:
 		pool->count_active--;
 		break;
@@ -109,22 +82,10 @@ void od_serverpool_set(od_serverpool_t *pool, od_server_t *server,
 		target = &pool->expire;
 		pool->count_expire++;
 		break;
-	case OD_SCLOSE:
-		target = &pool->close;
-		pool->count_close++;
-		break;
 	case OD_SIDLE:
 		target = &pool->idle;
 		pool->count_idle++;
 		break;
-	case OD_SCONNECT:
-		target = &pool->connect;
-		pool->count_connect++;
-		break;
-	case OD_SRESET:
-		target = &pool->reset;
-		pool->count_reset++;
-		break;
 	case OD_SACTIVE:
 		target = &pool->active;
 		pool->count_active++;
@@ -142,19 +103,13 @@ od_serverpool_next(od_serverpool_t *pool, od_serverstate_t state)
 {
 	od_list_t *target = NULL;
 	switch (state) {
-	case OD_SIDLE:    target = &pool->idle;
+	case OD_SIDLE:   target = &pool->idle;
 		break;
-	case OD_SEXPIRE:  target = &pool->expire;
+	case OD_SEXPIRE: target = &pool->expire;
 		break;
-	case OD_SCLOSE:   target = &pool->close;
+	case OD_SACTIVE: target = &pool->active;
 		break;
-	case OD_SCONNECT: target = &pool->connect;
-		break;
-	case OD_SRESET:   target = &pool->reset;
-		break;
-	case OD_SACTIVE:  target = &pool->active;
-		break;
-	case OD_SUNDEF:   assert(0);
+	case OD_SUNDEF:  assert(0);
 		break;
 	}
 	if (od_list_empty(target))
@@ -172,19 +127,13 @@ od_serverpool_foreach(od_serverpool_t *pool,
 {
 	od_list_t *target = NULL;
 	switch (state) {
-	case OD_SIDLE:    target = &pool->idle;
+	case OD_SIDLE:   target = &pool->idle;
 		break;
-	case OD_SEXPIRE:  target = &pool->expire;
+	case OD_SEXPIRE: target = &pool->expire;
 		break;
-	case OD_SCLOSE:   target = &pool->close;
+	case OD_SACTIVE: target = &pool->active;
 		break;
-	case OD_SCONNECT: target = &pool->connect;
-		break;
-	case OD_SRESET:   target = &pool->reset;
-		break;
-	case OD_SACTIVE:  target = &pool->active;
-		break;
-	case OD_SUNDEF:   assert(0);
+	case OD_SUNDEF:  assert(0);
 		break;
 	}
 	od_server_t *server;
diff --git a/src/od_server_pool.h b/src/od_server_pool.h
index 120bafc9..85729a18 100644
--- a/src/od_server_pool.h
+++ b/src/od_server_pool.h
@@ -14,17 +14,11 @@ typedef int (*od_serverpool_cb_t)(od_server_t*, void*);
 struct od_serverpool
 {
 	od_list_t active;
-	od_list_t connect;
-	od_list_t reset;
-	od_list_t expire;
-	od_list_t close;
 	od_list_t idle;
+	od_list_t expire;
 	int       count_active;
-	int       count_connect;
-	int       count_reset;
-	int       count_expire;
-	int       count_close;
 	int       count_idle;
+	int       count_expire;
 	od_list_t link;
 };